用户

src/main/java/com/yxt/portal/apiadmin/SysOrganizationRest.java

@@ -1,6 +1,7 @@
 package com.yxt.portal.apiadmin;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yxt.common.base.config.RedisUtil;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.QRCodeUtil;
@@ -140,10 +141,15 @@ public class SysOrganizationRest{
         //删除关联关系中的所有主管与分管的人员关系
         sysStaffOrgService.delZGAndFGByOrgSid(sid);
         if (StringUtils.isNotBlank(zgStaffSid)) {
-            ResultBean resultBean = sysOrganizationService.addSysStaffOrg(zgStaffSid, "1", sysOrganization);
+            ResultBean resultBean = sysOrganizationService.addSysZg(zgStaffSid, sysOrganization);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
             }
+        }else{
+            SysOrganization sysOrg =sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",sid));
+            sysOrg.setManagerSid("");
+            sysOrg.setManagerName("");
+            sysOrganizationService.updateById(sysOrg);
         }
         if (StringUtils.isNotBlank(fgStaffSid)) {
             ResultBean resultBean = sysOrganizationService.addSysStaffOrg(fgStaffSid, "2", sysOrganization);
@@ -258,8 +264,8 @@ public class SysOrganizationRest{
         BeanUtil.copyProperties(entity, vo);
         vo.setFgNames(fgNames);
         vo.setFgStaffSid(fgSids);
-        vo.setZgNames(zgNames);
+        vo.setZgNames(entity.getManagerName());
-        vo.setZgStaffSid(zgSids);
+        vo.setZgStaffSid(entity.getManagerSid());
         return rb.success().setData(vo);
     }
 

src/main/java/com/yxt/portal/biz/sysorganization/SysOrganization.java

@@ -84,4 +84,6 @@ public class SysOrganization extends BaseEntity {
 
     @ApiModelProperty("其他编码")
     private String otherCode;
+    private String managerSid;//主管sid
+    private String managerName;//主管人员姓名
 }

src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -5,16 +5,8 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.portal.biz.sysorganization.SysOrganizationVo">
         SELECT so.*,
-               (SELECT GROUP_CONCAT(ss.name)
+        so.managerName as  zgNames,
-                FROM `sys_staff_org` sso
+        so.managerSid as  zgSids,
-                         LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
-                WHERE so.`sid` = sso.`orgSid`
-                  AND sso.manageType = '1') zgNames,
-               (SELECT GROUP_CONCAT(ss.sid)
-                FROM `sys_staff_org` sso
-                         LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
-                WHERE so.`sid` = sso.`orgSid`
-                  AND sso.manageType = '1') zgSids,
                (SELECT GROUP_CONCAT(ss.name)
                 FROM `sys_staff_org` sso
                          LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`

src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationService.java

@@ -170,7 +170,27 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
     public List<SysOrganizationVo> selectChildrenListBySid(String sid) {
         return baseMapper.selectChildrenListByPsid(sid);
     }
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean addSysZg(String sids , SysOrganization entity) {
+        ResultBean rb = ResultBean.fireFail();
+        String[] sidArr = sids.split(",");
+        String name = "";
+        for (String sid : sidArr) {
+            SysOrganization sysOrg=baseMapper.selectOne(new QueryWrapper<SysOrganization>().eq("sid",entity.getSid()));
+            SysStaffinfo sysStaffinfo=sysStaffInfoService.getOne(new QueryWrapper<SysStaffinfo>().eq("sid",sid));
+            sysOrg.setManagerSid(sid);
+            sysOrg.setManagerName(sysStaffinfo.getName());
+            baseMapper.updateById(sysOrg);
+            //根据staffSid查询token
+            String token = sysUserService.selectByStaffsid(sid).getToken();
+            if (StringUtils.isNotBlank(token)) {
+                //清空该token
+                redisUtil.remove(token);
+            }
+        }
 
+        return rb.success();
+    }
     @Transactional(rollbackFor = Exception.class)
     public ResultBean addSysStaffOrg(String sids, String manageType, SysOrganization entity) {
         ResultBean rb = ResultBean.fireFail();

src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml

@@ -206,6 +206,7 @@
     <select id="getStaffName" resultType="java.util.Map">
         SELECT DISTINCT ss.sid, ss.name
         FROM sys_staffinfo ss
+            left join sys_user s on s.staffSid =ss.sid
                  LEFT JOIN sys_staff_org sso
                  left join sys_organization o on o.sid =sso.orgSid
                            ON ss.`sid` = sso.`staffSid`
@@ -216,6 +217,7 @@
         SELECT DISTINCT ss.sid,
                         ss.name
         FROM sys_staffinfo ss
+                 left join sys_user s on s.staffSid =ss.sid
                  LEFT JOIN sys_staff_org sso
                            ON ss.`sid` = sso.`staffSid`
             ${ew.customSqlSegment}

src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoService.java

@@ -732,7 +732,34 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
      */
     public ResultBean updateStaffInfo(SysStaffinfoDto dto, String sid) {
         ResultBean rb = ResultBean.fireFail();
-        //查询该人员的组织机构list
+        SysUser sysUser=sysUserService.getOne(new QueryWrapper<SysUser>().eq("staffSid",sid));
+        List<SysUserRole> d =sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("userSid",sysUser.getSid()).eq("orgSid",dto.getOrgSid()));
+        for (SysUserRole sysUserRole : d) {
+            if(sysUserRole.getRoleSid().equals("002")){
+                return rb.setMsg("单位管理员不能被修改");
+            }
+        }
+        SysOrganization sysOrgan=sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",dto.getSysStaffOrg().getOrgSid()).eq("managerSid",sid));
+        if(null!=sysOrgan){
+            sysOrgan.setManagerName("");
+            sysOrgan.setManagerSid("");
+            sysOrganizationService.updateById(sysOrgan);
+        }
+        SysStaffOrg sysStaffOrgs=sysStaffOrgService.getOne(new QueryWrapper<SysStaffOrg>().eq("staffSid",sid).eq("manageType","2").eq("orgSid",dto.getSysStaffOrg().getOrgSid()));//查询该人员的组织机构list
+        if(null!=sysStaffOrgs){
+            sysStaffOrgs.setManageType("3");
+            sysStaffOrgService.updateById(sysStaffOrgs);
+        }
+        SysOrganization sysOrg=sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",dto.getSysStaffOrg().getOrgSid()));
+        if(dto.getSysStaffOrg().getManageType().equals("1")){
+            sysOrg.setManagerSid(sid);
+            sysOrg.setManagerName(dto.getName());
+            sysOrganizationService.updateById(sysOrg);
+        }else if (dto.getSysStaffOrg().getManageType().equals("3")){
+            sysOrg.setManagerSid("");
+            sysOrg.setManagerName("");
+            sysOrganizationService.updateById(sysOrg);
+        }
         List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgService.selectByStaffS(sid);
         List<String> orgList = new ArrayList<>();
         if (sysStaffOrgVos.size() > 0) {
@@ -766,7 +793,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
 
         //更新用户信息
 //        sysUserService.updateByStaffSid(dto.getJobNumber(), sysStaffinfo.getMobile(), sid);
-        SysUser sysUser=sysUserService.getOne(new QueryWrapper<SysUser>().eq("staffSid",sid));
+//        SysUser sysUser=sysUserService.getOne(new QueryWrapper<SysUser>().eq("staffSid",sid));
         sysUser.setAccountType(dto.getAccountType());
         sysUser.setUserType(dto.getUserType());
         sysUser.setRemarks(dto.getRemarks());
@@ -779,8 +806,8 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         //更新员工的关联的部门信息
         SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg();
         SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSidn(sid,dto.getSysStaffOrg().getOrgSid1());
-        BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg);
+        BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg,"manageType");
-        sysStaffOrg.setManageType(dto.getSysStaffOrg().getManageType());
+//        sysStaffOrg.setManageType(dto.getSysStaffOrg().getManageType());
         if(StringUtils.isBlank(sysStaffOrg.getOrgSid())){
             sysStaffOrg.setOrgSid(dto.getOrgSid());
         }
@@ -859,6 +886,11 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
 //            SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(sid);
             SysStaffOrgDetailsVo sysStaffOrgDetailsVo = sysStaffOrgService.selectByStaffByType(sysUser.getStaffSid(), orgSid, type);
             SysOrganization s =sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",orgSid1));
+            if(StringUtils.isNotBlank(s.getManagerSid())){
+                if(s.getManagerSid().equals(sysUser.getStaffSid())){
+                    sysStaffOrgDetailsVo.setManageType("1");
+                }
+            }
             s.setOrgSidPath(s.getOrgSidPath()+"/");
             String b[]=s.getOrgSidPath().split("/");
             List<SysUserRoleVo> list=sysUserRoleService.selByUserSid(sysUser.getSid(),b[0]);
@@ -926,6 +958,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
     }
 
     public List<Map<String, String>> getStaffName(String staffName,String deptSid) {
+
         QueryWrapper<Map<String, Object>> qw = new QueryWrapper<>();
         SysOrganization sysOrganization=sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",deptSid));
         sysOrganization.setOrgSidPath(sysOrganization.getOrgSidPath()+"/");
@@ -933,11 +966,12 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         if (StringUtils.isNotBlank(staffName)) {
             qw.like("ss.name", staffName);
         }
-        qw.eq("ss.isDelete", 0);
+        qw.eq("s.isDelete", 0);
         qw.ne("sso.orgSid", deptSid);
         qw.like("o.orgSidPath", orgSids[0]);
-//        qw.ne("ss.personTypeKey","01");
+        qw.eq("sso.manageType","3");
-        return baseMapper.getStaffName(qw);
+        List<Map<String, String>> maps =baseMapper.getStaffName(qw).stream().filter(s->!s.get("name").equals("单位管理员")).collect(toList());
+        return maps;
     }
 
     public List<Map<String, String>> getStaffNameByDeptSid(String staffName, String deptSid) {
@@ -946,8 +980,8 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
             qw.like("ss.name", staffName);
         }
         qw.eq("sso.orgSid", deptSid);
-        qw.eq("ss.isDelete", 0);
+        qw.eq("s.isDelete", 0);
-//        qw.ne("ss.personTypeKey","01");
+        qw.eq("sso.manageType","3");
         return baseMapper.getStaffNameByDeptSid(qw);
     }
 

src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrg.java

@@ -41,6 +41,6 @@ public class SysStaffOrg extends BaseEntity {
 //	@ApiModelProperty("部门名称路径")
 //    private String orgNamePath;
     
-	@ApiModelProperty("管理类型：1、主管。2、分管。3、员工")
+	@ApiModelProperty("管理类型：2、分管。3、员工")
     private String manageType;
 }

src/main/java/com/yxt/portal/biz/sysuser/SysUserMapper.java

@@ -36,7 +36,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     //@Update("update sys_user set name=#{msg} where id=#{id}")
     //IPage<SysUserVo> voPage(IPage<SysUser> page, @Param(Constants.WRAPPER) QueryWrapper<SysUser> qw);
 
-    IPage<SysUserVo> selectPageVo(IPage<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> ew, @Param("orgName") String orgName, @Param("userName") String userName);
+    IPage<SysUserVo> selectPageVo(IPage<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> ew, @Param("orgName") String orgName, @Param("userName") String userName,@Param("orgSid") String orgSid);
 
     List<SysUserVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysUser> qw);
 

src/main/java/com/yxt/portal/biz/sysuser/SysUserMapper.xml

@@ -22,6 +22,16 @@
         WHERE staffOrg.staffSid = user.staffSid and staffOrg.manageType!=2
         ) departmentSid,
         (
+        SELECT
+        GROUP_CONCAT( org.sid )
+        FROM
+        sys_staff_org staffOrg
+        LEFT JOIN sys_organization org ON org.sid = staffOrg.orgSid
+        WHERE
+        staffOrg.staffSid = USER.staffSid
+        AND staffOrg.manageType != 2 AND org.orgSidPath like #{orgSid}
+        ) orgSid,
+        (
         SELECT GROUP_CONCAT(post.name)
         FROM sys_staff_post staffPost
         LEFT JOIN sys_post post ON post.sid = staffPost.postSid
@@ -41,8 +51,7 @@
         FROM sys_user_role user_role
         LEFT JOIN sys_role role ON role.sid = user_role.roleSid
         WHERE user_role.userSid = USER.sid and user_role.orgSid=SUBSTRING_INDEX(c.orgSidPath,'/',1)
-                        )              roleName,
+        ) roleName
-        c.sid as orgSid
         -- dict.dictValue userType,
         FROM sys_user USER
         LEFT JOIN sys_user_role user_role ON user_role.userSid = USER.sid
@@ -211,8 +220,7 @@
                  LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid
                  LEFT JOIN sys_organization so ON sso.orgSid = so.sid
         WHERE su.sid = #{userSid}
-        ORDER BY sso.id
+        ORDER BY sso.id LIMIT 1
-        LIMIT 1
     </select>
     <!--根据用户的sid查询用户的组织信息:多个时取第一个-->
     <select id="selectUserInfoByUserSid" resultType="com.yxt.portal.biz.sysuser.SysUserInfoVo">
@@ -222,8 +230,7 @@
                  LEFT JOIN sys_staff_org sso ON su.staffSid = sso.staffSid
                  LEFT JOIN sys_organization so ON sso.orgSid = so.sid
         WHERE su.sid = #{userSid}
-        ORDER BY sso.id
+        ORDER BY sso.id LIMIT 1
-        LIMIT 1
     </select>
 
     <select id="selectUserInfoByUserSidOne" resultType="com.yxt.portal.biz.sysuser.SysUserInfoVo">
@@ -234,8 +241,7 @@
                  LEFT JOIN sys_organization so ON sso.orgSid = so.sid
         WHERE su.sid = #{userSid}
           and find_in_set(#{orgSid}, replace(sso.orgSidPath, '/', ','))
-        ORDER BY sso.id
+        ORDER BY sso.id LIMIT 1
-        LIMIT 1
     </select>
     <!--根据员工sid更新用户表的工号以及手机号-->
     <update id="updateByStaffSid">
@@ -416,6 +422,7 @@
         select su.token
         from sys_staffinfo si
                  left join sys_user su on su.staffSid = si.sid
-        where si.personTypeKey = '01' and length(su.token)>0
+        where si.personTypeKey = '01'
+          and length(su.token) > 0
     </select>
 </mapper>

src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java

@@ -161,7 +161,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
             userName = query.getUserName().trim();
         }
 
-        IPage<SysUserVo> pagging = baseMapper.selectPageVo(page, qw, deptName, userName);
+        IPage<SysUserVo> pagging = baseMapper.selectPageVo(page, qw, deptName, userName,"%"+query.getOrgSid()+"%");
         List<SysUserVo> records = pagging.getRecords();
         for (SysUserVo record : records) {
             SysOrganization d =sysOrganizationService.getOne(new QueryWrapper<SysOrganization>().eq("sid",record.getOrgSid()));