diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java index ff5113a2..640ce2e6 100644 --- a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java +++ b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java @@ -116,6 +116,16 @@ public class SysUser extends BaseEntity private Long workType; + public String getVendorsCode() { + return vendorsCode; + } + + public void setVendorsCode(String vendorsCode) { + this.vendorsCode = vendorsCode; + } + + private String vendorsCode; + public Long getWorkType() { return workType; } diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java index 2c71e4fa..491b183e 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java @@ -17,6 +17,8 @@ import com.yanzhu.common.security.annotation.InnerAuth; import com.yanzhu.common.security.annotation.RequiresPermissions; import com.yanzhu.common.security.service.TokenService; import com.yanzhu.common.security.utils.SecurityUtils; +import com.yanzhu.manage.domain.AttendanceCfg; +import com.yanzhu.manage.mapper.AttendanceCfgMapper; import com.yanzhu.system.api.domain.SysDept; import com.yanzhu.system.api.domain.SysRole; import com.yanzhu.system.api.domain.SysUser; @@ -72,6 +74,9 @@ public class SysUserController extends BaseController { @Autowired private TokenService tokenService; + @Autowired + private AttendanceCfgMapper attendanceCfgMapper; + /** * 获取用户列表 */ @@ -129,6 +134,7 @@ public class SysUserController extends BaseController { if (StringUtils.isNull(sysUser)) { throw new ServiceException("用户名或密码错误"); } + /**if (StringUtils.isEmpty(sysUser.getRoles())) { throw new ServiceException("用户未查询到分配角色,请联系管理员!!!"); }*/ @@ -290,6 +296,13 @@ public class SysUserController extends BaseController { user.setComId(dept.getComId()); user.setActiveComId(dept.getComId()); user.setDept(dept); + AttendanceCfg cfgWhere=new AttendanceCfg(); + cfgWhere.setProjectId(dept.getDeptId()); + List cfgList=attendanceCfgMapper.selectAttendanceCfgList(cfgWhere); + if(cfgList.size()>0){ + user.setVendorsCode(cfgList.get(0).getVendorsCode()); + } + AjaxResult ajax = AjaxResult.success(); ajax.put("user", user); if(Objects.nonNull(user.getRoles()) && user.getRoles().size()>0){ diff --git a/yanzhu-ui-vue3/index.html b/yanzhu-ui-vue3/index.html index 2e374f69..1183307b 100644 --- a/yanzhu-ui-vue3/index.html +++ b/yanzhu-ui-vue3/index.html @@ -17,8 +17,9 @@ type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&&type=webgl&ak=6zAD8CIavtzWnkGg0a7roush5maGMIPn" > - - + + +