diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageController.java index 315704f5..7cb83158 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageController.java @@ -80,9 +80,13 @@ public class DgProcessManageController { public ResponseResult updateUserVisual(@RequestBody UpdateUserVisualReq updateUserVisualReq){ Integer id = updateUserVisualReq.getId(); Listids = updateUserVisualReq.getIds(); - //查询可见范围内的人可见列表 - Boolean a= iDgProcessManageService.updateUserVisual(id,ids); - return new ResponseResult().SUCCESS(a); + if(ids.size()>0){ + //查询可见范围内的人可见列表 + Boolean a= iDgProcessManageService.updateUserVisual(id,ids); + return new ResponseResult().SUCCESS(a); + }else{ + return new ResponseResult().SUCCESS(true); + } } /** diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java index d4e20977..04b9f1e9 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java @@ -210,6 +210,11 @@ public class UserLoginServiceImpl extends ServiceImpl loginLog.setLoginNum(1); loginLog.setCreateTime(new Date()); loginLog.setNewestTime(new Date()); + if(loginRequest.getType()==3){//客户小程序登录就添加客户小程序标识 + loginLog.setType(1);//标识为客户 + }else{ + loginLog.setType(0);//标识为员工 + } loginLogService.save(loginLog); }else { loginLog.setLoginNum(loginLog.getLoginNum() + 1); diff --git a/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/LoginLogMapper.xml b/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/LoginLogMapper.xml index 4491ec9e..a6c43dbf 100644 --- a/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/LoginLogMapper.xml +++ b/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/LoginLogMapper.xml @@ -18,6 +18,7 @@ left join hrms_employee_dept hed on hed.employee_id=he.id left join hrms_dept hd on hd.id=hed.dept_id + hll.type=0 AND (he.`name` LIKE CONCAT('%',#{loginLog.jobNumberOrName},'%') OR he.job_number LIKE CONCAT('%',#{loginLog.jobNumberOrName},'%')) diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java index edcabc56..d0dfb71a 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java @@ -321,4 +321,15 @@ public class EmployeeController implements EmployeeControllerApi { public EmployeeEntity getEmpmsgById(@RequestParam("id") Long id) { return employeeService.getEmpmsgById(id); } + + /** + * 查询超级管理员下面的userId + * + * @param + * @return + */ + @GetMapping("/getUserIdByRoleId") + public List getUserIdByRoleId() { + return employeeService.getUserIdByRoleId(); + } } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java index 97ca9501..6f3bb07c 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java @@ -119,4 +119,6 @@ public interface EmployeeDao extends BaseMapper { EmployeeEntity getEmpmsgById(Long id); List getAccountAndDeptNameByIds(@Param("ids")List ids); + + List getUserIdByRoleId(); } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java index 2701a3b1..0b9b7f33 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java @@ -81,5 +81,7 @@ public interface EmployeeService extends IService { EmployeeEntity getEmpmsgById(Long id); List getAccountAndDeptNameByIds(List ids); + + List getUserIdByRoleId(); } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java index a5fba62c..0be13d11 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java @@ -634,6 +634,7 @@ public class EmployeeServiceImpl extends ServiceImpl getUserIdByRoleId() { + return this.getBaseMapper().getUserIdByRoleId(); + } } \ No newline at end of file diff --git a/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml b/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml index d7bf694f..5c108087 100644 --- a/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml +++ b/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml @@ -657,4 +657,16 @@ AND e.user_id = #{id} + + \ No newline at end of file diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/LoginLog.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/LoginLog.java index 776335b5..ba266bbb 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/LoginLog.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/LoginLog.java @@ -20,6 +20,9 @@ public class LoginLog { //登录次数 private int loginNum; + //登录标识:0->员工;1->客户; + private Integer type; + //创建时间 private Date createTime;