diff --git a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPersonnel.java b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPersonnel.java index 416f183..b2c4769 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPersonnel.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentPersonnel.java @@ -40,6 +40,15 @@ public class TAmentPersonnel extends BaseEntity /** 部门ID */ @Excel(name = "部门ID") private Long deptId; + private String deptName; + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } /** 手机号码 */ @Excel(name = "手机号码") diff --git a/cyx-admin/src/main/java/com/cyx/wechat/WechatController.java b/cyx-admin/src/main/java/com/cyx/wechat/WechatController.java index 758f562..9164248 100644 --- a/cyx-admin/src/main/java/com/cyx/wechat/WechatController.java +++ b/cyx-admin/src/main/java/com/cyx/wechat/WechatController.java @@ -6,9 +6,15 @@ import com.cyx.common.core.domain.AjaxResult; import com.cyx.common.core.domain.entity.SysUser; import com.cyx.common.core.page.TableDataInfo; import com.cyx.common.enums.BusinessType; +import com.cyx.common.utils.StringUtils; +import com.cyx.system.service.ISysUserService; import com.cyx.web.base.domain.*; import com.cyx.web.base.service.*; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authc.AuthenticationException; +import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.apache.shiro.subject.Subject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; @@ -30,6 +36,34 @@ public class WechatController extends BaseController { private ITAmentCommitHisService commitHisService; @Autowired private ITAmentReviewedHisService reviewedHisService; + @Autowired + private ISysUserService userService; + + /** + * 微信小程序获取openId + * @param code + * @return + */ + @GetMapping(value = "/getUserInfo") + public AjaxResult getUserInfo(String code){ + SysUser user = userService.selectUserById(1L); + UsernamePasswordToken token = new UsernamePasswordToken(user.getUserName(), user.getPassword(), true); + Subject subject = SecurityUtils.getSubject(); + try + { + subject.login(token); + return success(); + } + catch (AuthenticationException e) + { + String msg = "用户或密码错误"; + if (StringUtils.isNotEmpty(e.getMessage())) + { + msg = e.getMessage(); + } + return error(msg); + } + } /** * 任务预警 diff --git a/cyx-admin/src/main/resources/templates/base/personnel/add.html b/cyx-admin/src/main/resources/templates/base/personnel/add.html index b7cf2df..e318707 100644 --- a/cyx-admin/src/main/resources/templates/base/personnel/add.html +++ b/cyx-admin/src/main/resources/templates/base/personnel/add.html @@ -20,6 +20,15 @@ +
+ +
+ +
+
@@ -27,9 +36,12 @@
- +
- + +
@@ -92,9 +104,9 @@
-
- -
+
+ +
@@ -109,6 +121,20 @@ focusCleanup: true }); + $.ajax({ + type: "post", + url: ctx + "base/personnel/deptList", + data: { + }, + success: function(data) { + var opt = ''; + data.data.forEach(d=>{ + opt += ''; + }) + $("#deptId")[0].innerHTML=opt; + } + }); + function submitHandler() { if ($.validate.form()) { $.operate.save(prefix + "/add", $('#form-personnel-add').serialize()); diff --git a/cyx-admin/src/main/resources/templates/base/personnel/edit.html b/cyx-admin/src/main/resources/templates/base/personnel/edit.html index 72df79c..5ca1cad 100644 --- a/cyx-admin/src/main/resources/templates/base/personnel/edit.html +++ b/cyx-admin/src/main/resources/templates/base/personnel/edit.html @@ -27,9 +27,10 @@
- +
- +
@@ -114,6 +115,24 @@ focusCleanup: true }); + refresh() + + function refresh(){ + $.ajax({ + type: "post", + url: ctx + "base/personnel/deptList", + data: { + }, + success: function(data) { + var opt = ''; + data.data.forEach(d=>{ + opt += ''; + }) + $("#deptId")[0].innerHTML=opt; + } + }); + } + function submitHandler() { if ($.validate.form()) { $.operate.save(prefix + "/edit", $('#form-personnel-edit').serialize()); diff --git a/cyx-admin/src/main/resources/templates/base/personnel/personnel.html b/cyx-admin/src/main/resources/templates/base/personnel/personnel.html index a2916c1..474c0c1 100644 --- a/cyx-admin/src/main/resources/templates/base/personnel/personnel.html +++ b/cyx-admin/src/main/resources/templates/base/personnel/personnel.html @@ -78,14 +78,21 @@ }, { field: 'sex', - title: '性别' + title: '性别', + formatter: function(value, row, index) { + if(row.sex === '1'){ + return '男' + }else if (row.sex === '2'){ + return '女' + } + } }, { field: 'nation', title: '民族' }, { - field: 'deptId', + field: 'deptName', title: '部门' }, { diff --git a/cyx-framework/src/main/java/com/cyx/framework/config/ShiroConfig.java b/cyx-framework/src/main/java/com/cyx/framework/config/ShiroConfig.java index 7ffb8f9..92df00a 100644 --- a/cyx-framework/src/main/java/com/cyx/framework/config/ShiroConfig.java +++ b/cyx-framework/src/main/java/com/cyx/framework/config/ShiroConfig.java @@ -288,6 +288,7 @@ public class ShiroConfig filterChainDefinitionMap.put("/ajax/**", "anon"); filterChainDefinitionMap.put("/js/**", "anon"); filterChainDefinitionMap.put("/ruoyi/**", "anon"); + filterChainDefinitionMap.put("/wx/**", "anon"); filterChainDefinitionMap.put("/captcha/captchaImage**", "anon"); // 退出 logout地址，shiro去清除session filterChainDefinitionMap.put("/logout", "logout"); diff --git a/cyx-system/src/main/resources/mapper/base/TAmentPersonnelMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentPersonnelMapper.xml index fe9f78b..6d8ab05 100644 --- a/cyx-system/src/main/resources/mapper/base/TAmentPersonnelMapper.xml +++ b/cyx-system/src/main/resources/mapper/base/TAmentPersonnelMapper.xml @@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -34,23 +35,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"