模板可见

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();
         List<Integer>ids = updateUserVisualReq.getIds();
-        //查询可见范围内的人可见列表
-        Boolean a= iDgProcessManageService.updateUserVisual(id,ids);
-        return new ResponseResult<PageUtils>().SUCCESS(a);
+        if(ids.size()>0){
+            //查询可见范围内的人可见列表
+            Boolean a= iDgProcessManageService.updateUserVisual(id,ids);
+            return new ResponseResult<PageUtils>().SUCCESS(a);
+        }else{
+            return new ResponseResult<PageUtils>().SUCCESS(true);
+        }
     }
 
     /**

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java

@@ -210,6 +210,11 @@ public class UserLoginServiceImpl extends ServiceImpl<UserLoginDao, UserEntity>
             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);

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
         <where>
+            hll.type=0
             <if test="loginLog.jobNumberOrName != null and loginLog.jobNumberOrName != ''">
                 AND (he.`name` LIKE CONCAT('%',#{loginLog.jobNumberOrName},'%') OR he.job_number LIKE CONCAT('%',#{loginLog.jobNumberOrName},'%'))
             </if>

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<EmployeeVO> getUserIdByRoleId() {
+        return employeeService.getUserIdByRoleId();
+    }
 }

dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java

@@ -119,4 +119,6 @@ public interface EmployeeDao extends BaseMapper<EmployeeEntity> {
     EmployeeEntity getEmpmsgById(Long id);
 
     List<EmployeeTO> getAccountAndDeptNameByIds(@Param("ids")List<Long> ids);
+
+    List<EmployeeVO> getUserIdByRoleId();
 }

dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java

@@ -81,5 +81,7 @@ public interface EmployeeService extends IService<EmployeeEntity> {
     EmployeeEntity getEmpmsgById(Long id);
 
     List<EmployeeTO> getAccountAndDeptNameByIds(List<Long> ids);
+
+    List<EmployeeVO> getUserIdByRoleId();
 }
 

dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java

@@ -634,6 +634,7 @@ public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity
         return this.getBaseMapper().getAccountAndDeptNameByIds(ids);
     }
 
+
     /**
      * 根据userId查询员工的头像
      *
@@ -728,4 +729,9 @@ public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity
     public EmployeeEntity getEmpmsgById(Long id) {
         return this.getBaseMapper().getEmpmsgById(id);
     }
+
+    @Override
+    public List<EmployeeVO> getUserIdByRoleId() {
+        return this.getBaseMapper().getUserIdByRoleId();
+    }
 }

dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml

@@ -657,4 +657,16 @@
         AND e.user_id = #{id}
     </select>
 
+    <select id="getUserIdByRoleId" resultType="com.daqing.framework.domain.hrms.ext.EmployeeVO">
+        SELECT
+            u.id id,
+            e.NAME NAME
+        FROM
+        hrms_employee_role er
+        LEFT JOIN hrms_user u ON er.user_id = u.id
+        LEFT JOIN	hrms_employee e ON e.user_id = u.id
+        WHERE
+            u.del_or_not = 0 and er.role_id=1
+    </select>
+
 </mapper>

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;