Merge remote-tracking branch 'origin/V0.0.1' into V0.0.1

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysUser.java

@@ -31,7 +31,7 @@ import org.bouncycastle.util.Fingerprint;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("sys_user")
-@ApiModel(value = "SysUser对象" , description = "【请填写功能名称】")
+@ApiModel(value = "SysUser对象", description = "【请填写功能名称】")
 public class SysUser extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -124,7 +124,7 @@ public class SysUser extends BaseEntity {
      * 登录时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "登录时间" )
+    @ApiModelProperty(value = "登录时间")
     private Date lastTime;
 
     /**
@@ -179,7 +179,7 @@ public class SysUser extends BaseEntity {
      * 签署时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "签署时间" )
+    @ApiModelProperty(value = "签署时间")
     private Date signTime;
 
     /**
@@ -223,9 +223,12 @@ public class SysUser extends BaseEntity {
      */
     @ApiModelProperty(value = "原始机构编码")
     private Long originalOrgId;
+    @TableField(exist = false)
+    private Long isManager;
 
-
-    /** 机构对象 */
+    /**
+     * 机构对象
+     */
     @TableField(exist = false)
     private SysOrg org;
 
@@ -234,113 +237,114 @@ public class SysUser extends BaseEntity {
 
     @TableField(exist = false)
     private List<SysRole> roles;
-    public boolean isAdmin()
-    {
+
+    public boolean isAdmin() {
         return isAdmin(this.getId());
     }
-    public static boolean isAdmin(Long userId)
-    {
+
+    public static boolean isAdmin(Long userId) {
         return userId != null && 1L == userId;
     }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
 
 
-                .append("id" , getId())
+                .append("id", getId())
 
 
-                .append("deptId" , getDeptId())
+                .append("deptId", getDeptId())
 
 
-                .append("isLock" , getIsLock())
+                .append("isLock", getIsLock())
 
 
-                .append("jobId" , getJobId())
+                .append("jobId", getJobId())
 
 
-                .append("username" , getUsername())
+                .append("username", getUsername())
 
 
-                .append("name" , getName())
+                .append("name", getName())
 
 
-                .append("orgId" , getOrgId())
+                .append("orgId", getOrgId())
 
 
-                .append("phone" , getPhone())
+                .append("phone", getPhone())
 
 
-                .append("createTime" , getCreateTime())
+                .append("createTime", getCreateTime())
 
 
-                .append("modifiedName" , getModifiedName())
+                .append("modifiedName", getModifiedName())
 
 
-                .append("updateTime" , getUpdateTime())
+                .append("updateTime", getUpdateTime())
 
 
-                .append("modifiedId" , getModifiedId())
+                .append("modifiedId", getModifiedId())
 
 
-                .append("password" , getPassword())
+                .append("password", getPassword())
 
 
-                .append("salt" , getSalt())
+                .append("salt", getSalt())
 
 
-                .append("deleted" , getDeleted())
+                .append("deleted", getDeleted())
 
 
-                .append("lastIp" , getLastIp())
+                .append("lastIp", getLastIp())
 
 
-                .append("lastTime" , getLastTime())
+                .append("lastTime", getLastTime())
 
 
-                .append("orgName" , getOrgName())
+                .append("orgName", getOrgName())
 
 
-                .append("orgPath" , getOrgPath())
+                .append("orgPath", getOrgPath())
 
 
-                .append("image" , getImage())
+                .append("image", getImage())
 
 
-                .append("card" , getCard())
+                .append("card", getCard())
 
 
-                .append("gender" , getGender())
+                .append("gender", getGender())
 
 
-                .append("jobNumber" , getJobNumber())
+                .append("jobNumber", getJobNumber())
 
 
-                .append("note" , getNote())
+                .append("note", getNote())
 
 
-                .append("isSign" , getIsSign())
+                .append("isSign", getIsSign())
 
 
-                .append("signTime" , getSignTime())
+                .append("signTime", getSignTime())
 
 
-                .append("agreementId" , getAgreementId())
+                .append("agreementId", getAgreementId())
 
 
-                .append("signVersion" , getSignVersion())
+                .append("signVersion", getSignVersion())
 
 
-                .append("approveStatus" , getApproveStatus())
+                .append("approveStatus", getApproveStatus())
 
 
-                .append("locked" , getLocked())
+                .append("locked", getLocked())
 
 
-                .append("createBy" , getCreateBy())
+                .append("createBy", getCreateBy())
 
 
-                .append("updateBy" , getUpdateBy())
+                .append("updateBy", getUpdateBy())
                 .toString();
     }
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysUserInformation.java

@@ -1,6 +1,7 @@
 package com.xunmei.system.api.domain;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -26,155 +27,190 @@ import com.xunmei.common.core.web.domain.BaseEntity;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("sys_user_information")
-@ApiModel(value = "SysUserInformation对象" , description = "【请填写功能名称】")
-public class SysUserInformation extends BaseEntity
-        {
-private static final long serialVersionUID=1L;
+@ApiModel(value = "SysUserInformation对象", description = "【请填写功能名称】")
+public class SysUserInformation extends BaseEntity {
+    private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
-    /** 用户ID */
-            @ApiModelProperty(value = "用户ID")
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty(value = "用户ID")
     private Long userId;
 
-    /** 所属部门ID */
-            @ApiModelProperty(value = "所属部门ID")
+    /**
+     * 所属部门ID
+     */
+    @ApiModelProperty(value = "所属部门ID")
     private String deptId;
 
-    /** 职务ID */
-            @ApiModelProperty(value = "职务")
+    /**
+     * 职务ID
+     */
+    @ApiModelProperty(value = "职务")
     private String duties;
 
-    /** 用工形式 */
-            @ApiModelProperty(value = "用工形式")
+    /**
+     * 用工形式
+     */
+    @ApiModelProperty(value = "用工形式")
     private String workType;
 
-    /** 是否专职0是1否 */
-            @ApiModelProperty(value = "是否专职0是1否")
-    private String isFullTime;
+    /**
+     * 是否专职0是1否
+     */
+    @ApiModelProperty(value = "是否专职0是1否")
+    private String isFullTime = "1";
 
-    /** 最高学历 */
-            @ApiModelProperty(value = "最高学历")
+    /**
+     * 最高学历
+     */
+    @ApiModelProperty(value = "最高学历")
     private String highestEducation;
 
-    /** 学历取得形式 */
-            @ApiModelProperty(value = "学历取得形式")
+    /**
+     * 学历取得形式
+     */
+    @ApiModelProperty(value = "学历取得形式")
     private String educationType;
 
-    /** 是否持证上岗 */
-            @ApiModelProperty(value = "是否持证上岗")
-    private String certificateWork;
+    /**
+     * 是否持证上岗
+     */
+    @ApiModelProperty(value = "是否持证上岗")
+    private String certificateWork = "1";
 
-    /** 初级以上相关专业技术职业资格 */
-            @ApiModelProperty(value = "初级以上相关专业技术职业资格")
+    /**
+     * 初级以上相关专业技术职业资格
+     */
+    @ApiModelProperty(value = "初级以上相关专业技术职业资格")
     private String professionalQualifications;
 
-    /** 持证上岗未通过原因 */
-            @ApiModelProperty(value = "持证上岗未通过原因")
+    /**
+     * 持证上岗未通过原因
+     */
+    @ApiModelProperty(value = "持证上岗未通过原因")
     private String certificateFailReason;
 
-    /** 参加工作时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd")
-            @ApiModelProperty(value = "参加工作时间")
+    /**
+     * 参加工作时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "参加工作时间")
     private Date workTime;
 
-    /** 入职现在公司的时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd")
-            @ApiModelProperty(value = "入职现在公司的时间")
+    /**
+     * 入职现在公司的时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "入职现在公司的时间")
     private Date entryTime;
 
-    /** 出生时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd")
-            @ApiModelProperty(value = "出生时间")
+    /**
+     * 出生时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "出生时间")
     private Date bornTime;
 
-    /** 分管领导名字 */
-            @ApiModelProperty(value = "分管领导名字")
+    /**
+     * 分管领导名字
+     */
+    @ApiModelProperty(value = "分管领导名字")
     private String responsibilitiesLeaderName;
 
-    /** 分管领导职务 */
-            @ApiModelProperty(value = "分管领导职务")
+    /**
+     * 分管领导职务
+     */
+    @ApiModelProperty(value = "分管领导职务")
     private String responsibilitiesLeaderDuties;
 
-    /** 资格证 */
-            @ApiModelProperty(value = "资格证")
+    /**
+     * 资格证
+     */
+    @ApiModelProperty(value = "资格证")
     private String qualificationCertificateUrl;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     private String delFlag;
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
-@Override
-public String toString(){
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
 
 
-                .append("id" ,getId())
+                .append("id", getId())
 
 
-                .append("userId" ,getUserId())
+                .append("userId", getUserId())
 
 
-                .append("deptId" ,getDeptId())
+                .append("deptId", getDeptId())
 
 
-                .append("duties" ,getDuties())
+                .append("duties", getDuties())
 
 
-                .append("workType" ,getWorkType())
+                .append("workType", getWorkType())
 
 
-                .append("isFullTime" ,getIsFullTime())
+                .append("isFullTime", getIsFullTime())
 
 
-                .append("highestEducation" ,getHighestEducation())
+                .append("highestEducation", getHighestEducation())
 
 
-                .append("educationType" ,getEducationType())
+                .append("educationType", getEducationType())
 
 
-                .append("certificateWork" ,getCertificateWork())
+                .append("certificateWork", getCertificateWork())
 
 
-                .append("professionalQualifications" ,getProfessionalQualifications())
+                .append("professionalQualifications", getProfessionalQualifications())
 
 
-                .append("certificateFailReason" ,getCertificateFailReason())
+                .append("certificateFailReason", getCertificateFailReason())
 
 
-                .append("workTime" ,getWorkTime())
+                .append("workTime", getWorkTime())
 
 
-                .append("entryTime" ,getEntryTime())
+                .append("entryTime", getEntryTime())
 
 
-                .append("bornTime" ,getBornTime())
+                .append("bornTime", getBornTime())
 
 
-                .append("responsibilitiesLeaderName" ,getResponsibilitiesLeaderName())
+                .append("responsibilitiesLeaderName", getResponsibilitiesLeaderName())
 
 
-                .append("responsibilitiesLeaderDuties" ,getResponsibilitiesLeaderDuties())
+                .append("responsibilitiesLeaderDuties", getResponsibilitiesLeaderDuties())
 
 
-                .append("qualificationCertificateUrl" ,getQualificationCertificateUrl())
+                .append("qualificationCertificateUrl", getQualificationCertificateUrl())
 
 
-                .append("createBy" ,getCreateBy())
+                .append("createBy", getCreateBy())
 
 
-                .append("createTime" ,getCreateTime())
+                .append("createTime", getCreateTime())
 
 
-                .append("updateBy" ,getUpdateBy())
+                .append("updateBy", getUpdateBy())
 
 
-                .append("updateTime" ,getUpdateTime())
+                .append("updateTime", getUpdateTime())
 
 
-                .append("delFlag" ,getDelFlag())
-        .toString();
-        }
-        }
+                .append("delFlag", getDelFlag())
+                .toString();
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/domain/TMonitoringRetrievalPlan.java

@@ -104,6 +104,7 @@ public class TMonitoringRetrievalPlan extends BaseEntity {
      * 计划状态（0启用、1禁用）
      */
     @ApiModelProperty(value = "计划状态", notes = "0=启用、1禁用")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Integer planStatus;
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -1,23 +1,20 @@
 package com.xunmei.core.access.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
+
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.common.core.constant.ErrorMsgConstants;
+
 import com.xunmei.common.core.constant.SecurityConstants;
-import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingPlan;
-import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanPageVo;
-import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanRoleVo;
 import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.common.core.exception.ServiceException;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.StringUtils;
-import com.xunmei.common.core.vo.IdNameVo;
+
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
@@ -25,14 +22,14 @@ import com.xunmei.core.access.mapper.TMonitoringRetrievalPlanMapper;
 import com.xunmei.core.access.service.ITMonitoringRetrievalPlanService;
 import com.xunmei.core.access.vo.TMonitoringRetrievalPlanVO;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
-import com.xunmei.system.api.Eto.RoleConditionEto;
+
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.RemoteRoleService;
 import com.xunmei.system.api.RemoteUserService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.domain.SysUser;
-import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -40,7 +37,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
+
 import java.util.stream.Collectors;
 
 
@@ -55,6 +52,7 @@ import java.util.stream.Collectors;
 public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoringRetrievalPlanMapper, TMonitoringRetrievalPlan> implements ITMonitoringRetrievalPlanService {
     private static final Integer MINUS_ONE = -1;
     private static final Integer ZERO = 0;
+    private static final String PARENT_ID="parent_id";
     @Autowired
     private TMonitoringRetrievalPlanMapper tMonitoringRetrievalPlanMapper;
     @Autowired
@@ -94,7 +92,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         if (Boolean.TRUE.equals(checkSub)) {
             SysOrg sysOrg = remoteOrgService.selectSysOrgById(tMonitoringRetrievalPlan.getOrgId(), SecurityConstants.INNER);
             tMonitoringRetrievalPlan.setOrgId(null);
-            query.lambda().likeRight(TMonitoringRetrievalPlan::getOrgPath,sysOrg.getPath());
+            query.lambda().likeRight(TMonitoringRetrievalPlan::getOrgPath, sysOrg.getPath());
         }
         if (StringUtils.isNotEmpty(planName)) {
             query.like("plan_name", planName);
@@ -105,13 +103,12 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         }
         query.orderByDesc("create_time");
         //获取数据
-        query.eq("create_type", 0);
+        query.isNull(PARENT_ID);
         page = tMonitoringRetrievalPlanMapper.selectPage(page, query);
-        SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectTopOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         List<TMonitoringRetrievalPlan> records = page.getRecords();
         List<TMonitoringRetrievalPlanVO> tMonitoringRetrievalPlanVOS = BeanHelper.copyProperties(records, TMonitoringRetrievalPlanVO.class);
         for (TMonitoringRetrievalPlanVO monitoringRetrievalPlan : tMonitoringRetrievalPlanVOS) {
-            dealData(monitoringRetrievalPlan, tMonitoringRetrievalPlanVOS, sysOrg.getId());
+            dealData(monitoringRetrievalPlan, tMonitoringRetrievalPlanVOS);
         }
         //抓换为TableDataInfo适配前端
         TableDataInfo<TMonitoringRetrievalPlanVO> tableDataInfo = new TableDataInfo();
@@ -122,7 +119,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         return tableDataInfo;
     }
 
-    private void dealData(TMonitoringRetrievalPlanVO record, List<TMonitoringRetrievalPlanVO> records, Long orgId) {
+    private void dealData(TMonitoringRetrievalPlanVO record, List<TMonitoringRetrievalPlanVO> records) {
         record.setNo(records.indexOf(record) + 1);
         List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = tMonitoringRetrievalPlanMapper.selectList(new LambdaQueryWrapper<TMonitoringRetrievalPlan>().eq(TMonitoringRetrievalPlan::getParentId, record.getId()));
         List<TMonitoringRetrievalPlanVO> children = BeanHelper.copyProperties(tMonitoringRetrievalPlans, TMonitoringRetrievalPlanVO.class);
@@ -144,9 +141,15 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     public int distribute(Long id) {
         //查询
         TMonitoringRetrievalPlan tMonitoringRetrievalPlan = tMonitoringRetrievalPlanMapper.selectById(id);
-        if (tMonitoringRetrievalPlan.getPlanStatus()==1){
+        if (tMonitoringRetrievalPlan.getPlanStatus() == 1) {
             throw new ServiceException("禁用中，不能下发");
         }
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq(PARENT_ID, id);
+        List list1 = tMonitoringRetrievalPlanMapper.selectList(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list1)) {
+            throw new ServiceException("请勿重复下发");
+        }
         List<SysOrg> list = remoteOrgService.selectSysOrgByParentId(tMonitoringRetrievalPlan.getOrgId(), SecurityConstants.INNER);
         Integer i = ZERO;
         List<TMonitoringRetrievalPlan> tMonitoringRetrievalPlans = new ArrayList<>();
@@ -216,10 +219,10 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         tMonitoringRetrievalPlan.setId(id);
         tMonitoringRetrievalPlan.setOrgPath(data.getPath());
         if (tMonitoringRetrievalPlan.getOrgType().equals("1")) {
-            tMonitoringRetrievalPlan.setPlanStatus(1);
+
             tMonitoringRetrievalPlan.setCreateType(ZERO);
         } else {
-            tMonitoringRetrievalPlan.setPlanStatus(ZERO);
+
             tMonitoringRetrievalPlan.setCreateType(1);
             //无周期调用
             if (tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString())) {
@@ -241,6 +244,11 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     public int updateTMonitoringRetrievalPlan(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
         tMonitoringRetrievalPlan.setUpdateTime(DateUtils.getNowDate());
         tMonitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());
+        if (tMonitoringRetrievalPlan.getOrgType().equals("1")) {
+            tMonitoringRetrievalPlan.setCreateType(ZERO);
+        }else {
+            tMonitoringRetrievalPlan.setCreateType(1);
+        }
         return tMonitoringRetrievalPlanMapper.updateById(tMonitoringRetrievalPlan);
     }
 
@@ -265,7 +273,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
             } else {
                 if (monitoringRetrievalPlan.getCreateType() == 0) {
                     QueryWrapper queryWrapper = new QueryWrapper();
-                    queryWrapper.eq("parent_id", monitoringRetrievalPlan.getId());
+                    queryWrapper.eq(PARENT_ID, monitoringRetrievalPlan.getId());
                     List<TMonitoringRetrievalPlan> list = tMonitoringRetrievalPlanMapper.selectList(queryWrapper);
                     list.add(monitoringRetrievalPlan);
                     for (TMonitoringRetrievalPlan p : list) {

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -68,14 +68,23 @@ public class SysUserController extends BaseController {
      */
     @RequiresPermissions("system:user:list")
     @GetMapping("/list")
-    public TableDataInfo<SysUser> list(SysUser user) {
-        return userService.selectUserList(user);
+    public AjaxResult list(SysUser user) {
+        AjaxResult ajax = AjaxResult.success();
+        com.xunmei.common.core.web.page.TableDataInfo<com.xunmei.system.api.domain.SysUser> sysUserTableDataInfo = userService.selectUserList(user);
+        ajax.put("data", sysUserTableDataInfo);
+        boolean admin = false;
+        String s = roleService.selectRoleNameByUserId(SecurityUtils.getUserId());
+        if (s.contains("超级管理员")) {
+            admin = true;
+        }
+        ajax.put("check", admin);
+        return ajax;
     }
 
 
     @RequiresPermissions("system:user:list")
     @GetMapping("/dictionlist")
-    public R<List<SysUser>>  list2(SysUser user) {
+    public R<List<SysUser>> list2(SysUser user) {
         try {
             return R.ok(userService.selectSyncUserList(user));
         } catch (Exception e) {
@@ -355,8 +364,8 @@ public class SysUserController extends BaseController {
     public R<Boolean> userLoginInfo(Long id, Date loginTime, String loginIp) {
         SysUser sysUser = userService.selectUserById(id);
         sysUser.setLastIp(loginIp);
-        if (null==loginTime){
-            loginTime= DateUtils.getNowDate();
+        if (null == loginTime) {
+            loginTime = DateUtils.getNowDate();
         }
         sysUser.setLastTime(loginTime);
         userService.saveOrUpdate(sysUser);

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysRoleMapper.java

@@ -29,7 +29,7 @@ public interface SysRoleMapper extends BaseMapper<SysRole>
      * @return 角色列表
      */
      List<SysRole> selectRolePermissionByUserId(Long userId);
-
+String selectRoleNameByUserId(Long userId);
     /**
      * 查询所有角色
      * 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysRoleService.java

@@ -109,7 +109,7 @@ public interface ISysRoleService extends IService<SysRole>
      * @return 结果
      */
     int insertRole(SysRole role);
-
+String selectRoleNameByUserId(Long userId);
     /**
      * 修改保存角色信息
      *

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgExtendServiceImpl.java

@@ -4,9 +4,12 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.xunmei.common.core.constant.CacheConstants;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.StringUtils;
+import com.xunmei.common.redis.utils.RedisUtils;
 import com.xunmei.system.api.domain.SysOrg;
+import com.xunmei.system.api.vo.SysOrgVO;
 import com.xunmei.system.domain.SysPhysicalDefenseConstruction;
 import com.xunmei.system.dto.SysOrgExtendDto;
 import com.xunmei.system.mapper.SysOrgMapper;
@@ -143,8 +146,11 @@ public class SysOrgExtendServiceImpl extends ServiceImpl<SysOrgExtendMapper, Sys
         /*
          * 重置缓存
          */
-        orgService.clearOrgCache();
-        orgService.loadingOrgCache();
+        RedisUtils.deleteObject(CacheConstants.ORG_CACHE_LIST_KEY);
+        List<SysOrgVO> sysOrgVOS = orgMapper.selectSysOrgVOList();
+        RedisUtils.setCacheList(CacheConstants.ORG_CACHE_LIST_KEY, sysOrgVOS);
+//        orgService.clearOrgCache();
+//        orgService.loadingOrgCache();
 
         //处理物防建设数据
         physicalDefenseConstructionMapper.delete(new LambdaQueryWrapper<SysPhysicalDefenseConstruction>().eq(SysPhysicalDefenseConstruction::getOrgId,org.getId()));

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysRoleServiceImpl.java

@@ -239,6 +239,11 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         return insertRoleMenu(role);
     }
 
+    @Override
+    public String selectRoleNameByUserId(Long userId) {
+        return roleMapper.selectRoleNameByUserId(userId);
+    }
+
     /**
      * 修改保存角色信息
      *

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/WorkTimeBusiness.java

@@ -1,403 +0,0 @@
-//package com.xunmei.system.service.impl;
-//
-//import cn.hutool.core.date.DateField;
-//import cn.hutool.core.date.DateTime;
-//import cn.hutool.core.date.DateUtil;
-//import cn.hutool.core.util.ObjectUtil;
-//import com.alibaba.fastjson.JSON;
-//import com.isp.app.domain.*;
-//import com.isp.app.dto.holiday.HolidayDto;
-//import com.isp.app.dto.workTime.WorkTimeEditDto;
-//import com.isp.app.dto.workTimeMonth.WorkTimeMonthFindMonthDto;
-//import com.isp.app.repository.WorkTimeSetRepository;
-//import com.isp.app.service.*;
-//import com.isp.app.vo.workTime.WorkTimeNewVo;
-//import com.isp.common.constant.SystemParameterConstant;
-//import com.isp.common.context.LoginUser;
-//import com.isp.common.context.RequestHolder;
-//import com.isp.common.util.BeanHelper;
-//import com.isp.common.util.DateHelper;
-//import com.isp.common.util.StreamHelper;
-//import com.isp.core.domain.Org;
-//import com.isp.core.mapper.ObjectMapper;
-//import com.isp.core.service.OrgService;
-//import com.xunmei.system.api.domain.SysWorkTime;
-//import com.xunmei.system.domain.SysWorkTimeMonth;
-//import com.xunmei.system.domain.SysWorkTimeSet;
-//import com.xunmei.system.service.ISysOrgService;
-//import com.xunmei.system.service.ISysWorkTimeService;
-//import com.xunmei.system.service.ISysWorkTimeSetService;
-//import com.xunmei.system.util.BeanHelper;
-//import com.xunmei.system.util.DateHelper;
-//import com.xunmei.system.util.StreamHelper;
-//import lombok.extern.slf4j.Slf4j;
-//import org.apache.commons.collections4.CollectionUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//import org.springframework.transaction.annotation.Transactional;
-//
-//import java.util.*;
-//import java.util.stream.Collectors;
-//
-//import static com.isp.common.util.LogUtils.WORKTIMEBUSINESSLOG;
-//
-//@Slf4j
-//@Component
-//public class WorkTimeBusiness {
-//
-//    @Autowired
-//    private ISysWorkTimeService workTimeMonthService;
-//
-//    @Autowired
-//    private ISysWorkTimeService workTimeService;
-//
-//    @Autowired
-//    ISysWorkTimeSetService workTimeSetService;
-//
-////    @Autowired
-////    HolidayService holidayService;
-//
-////    @Autowired
-////    private WorkTimeSetRepository workTimeSetRepository;
-//
-//    @Autowired
-//    private ISysOrgService orgService;
-//
-////    @Autowired
-////    SystemParameService systemParameService;
-//
-////    @Autowired
-////    ObjectMapper objectMapper;
-//
-//    /**
-//     * @param orgId
-//     * @param month
-//     * @param workTimeEditDtoList
-//     */
-//    @Transactional
-//    public SysWorkTimeMonth batch(final Long orgId, final Date month, final List<SysWorkTime> workTimeEditDtoList) {
-//        // 小于现在时间的不允许修改
-//        final Date now = DateUtil.beginOfDay(new Date());
-//        List<SysWorkTime> workTimeList = StreamHelper.to(workTimeEditDtoList, workTimeEditDto -> {
-//            final Date workDate = workTimeEditDto.getDate();
-//            if (workTimeEditDto.getIsEnable() == null || workDate.before(now)) {
-////                WORKTIMEBUSINESSLOG.info("作息时间[ {} ]小于现在时间, 不允许改变", workDate);
-//                return null;
-//            }
-//            final SysWorkTime workTime = SysWorkTime.of(orgId, workTimeEditDto.getDate());
-//            BeanHelper.copyProperties(workTime, workTimeEditDto);
-//            workTime.setIsManual(0L);
-//            workTime.setIsEnable(workTimeEditDto.getIsEnable());
-//            if (!(workTimeEditDto.getIsEnable() > 0)) {
-//                workTime.setWorkTime(null);
-//                workTime.setWorkOffTime(null);
-//                workTime.setOpenTime(null);
-//                workTime.setCloseTime(null);
-//                workTime.setNoonbreakStart(null);
-//                workTime.setNoonbreakEnd(null);
-//            }
-//            return workTime;
-//        }, true);
-//
-//        //
-//        for (SysWorkTime s :
-//                workTimeList) {
-//            workTimeService.save(s);
-//            workTimeList.add(s);
-//        }
-//        WorkTimeMonthFindMonthDto request = new WorkTimeMonthFindMonthDto();
-//        request.setMonth(month);
-//        request.setOrgId(orgId);
-//        WorkTimeMonth db = workTimeMonthService.findMonthTime(request);
-//        if (db != null) {
-//            int openCount = (int) workTimeEditDtoList.stream().filter(w -> w.getIsEnable() != null && w.getIsEnable() == true).count();
-//            int closeCount = (int) workTimeEditDtoList.stream().filter(w -> w.getIsEnable() != null && w.getIsEnable() == false).count();
-//            ;
-////            for (final WorkTime workTime : workTimeList) {
-////                if (workTime.getIsEnable()) {
-////                    openCount++;
-////                } else {
-////                    closeCount++;
-////                }
-////            }
-//            db.setUpdateTime(new Date());
-//            db.setCloseCount(closeCount);
-//            db.setOpenCount(openCount);
-//            return this.workTimeMonthService.save(db);
-//        } else {
-//            return this.workTimeMonthService.save(WorkTimeMonth.of(orgId, month, workTimeList));
-//        }
-//    }
-//
-//    /**
-//     * 生成下个月的作息
-//     */
-//    @Transactional
-//    public void generateNextMonth() {
-//        Calendar calendar = Calendar.getInstance();
-//        calendar.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-//        System.out.println("============================ work_time_job 1================== : " + calendar.getTime());
-//
-//        calendar.set(Calendar.DAY_OF_MONTH, 1);
-//        calendar.add(Calendar.MONTH, 1);
-//        Integer year = calendar.get(Calendar.YEAR);
-//        generateWorkTime(year, calendar.get(Calendar.MONTH));
-////        List<WorkTimeSet> workTimes = workTimeSetService.find("year", year);
-////
-////        final Date date = DateHelper.getDate(calendar.getTime());
-////        System.out.println("============================ work_time_job 2================== : " + date);
-////        final DateHelper dateTime = new DateHelper(date);
-////        final Date start = dateTime.monthStart();
-////        final Date end = dateTime.monthEnd();
-////        final List<DateTime> dateTimeList = DateUtil.rangeToList(start, end, DateField.DAY_OF_MONTH);
-////        HolidayDto holidayDto = new HolidayDto();
-////        holidayDto.setYear(year);
-////        List<Holiday> holidayList = this.holidayService.all(holidayDto);
-////        List<Date> holidayDates = null;
-////        if (CollectionUtils.isNotEmpty(holidayList)) {
-////            holidayDates = holidayList.stream().map(p -> p.getYmdDate()).collect(Collectors.toList());
-////        }
-////        for (WorkTimeSet workTime : workTimes) {
-////            if(ObjectUtil.isNull(workTime.getOrgId())){
-////                continue;
-////            }
-////
-////            List<WorkTimeEditDto> workTimeEditDtoList = new ArrayList<>();
-////            List<Holiday> holidays = workTime.getHolidayList();
-////            List<Date> need = null;
-////            if (CollectionUtils.isNotEmpty(holidays)) {
-////                need = holidays.stream().map(p -> p.getYmdDate()).collect(Collectors.toList());
-////            }
-////            for (DateTime time : dateTimeList) {
-////                WorkTimeEditDto dto = new WorkTimeEditDto();
-////                dto.setDate(time);
-////                dto.setWorkTime(workTime.getWorkTime());
-////                dto.setWorkOffTime(workTime.getWorkOffTime());
-////                dto.setOpenTime(workTime.getOpenTime());
-////                dto.setCloseTime(workTime.getCloseTime());
-////                dto.setNoonbreakStart(workTime.getNoonbreakStart());
-////                dto.setNoonbreakEnd(workTime.getNoonbreakEnd());
-////                dto.setIsEnable(false);
-////                if (holidayDates != null && (!holidayDates.contains(time.toJdkDate()))) {
-////                    if (workTime.getSunday() && time.dayOfWeek() == 1) {
-////                        dto.setIsEnable(true);
-////                    }
-////                    if (workTime.getMonday() && time.dayOfWeek() == 2) {
-////                        dto.setIsEnable(true);
-////                    }
-////                    if (workTime.getTuesday() && time.dayOfWeek() == 3) {
-////                        dto.setIsEnable(true);
-////                    }
-////                    if (workTime.getWednesday() && time.dayOfWeek() == 4) {
-////                        dto.setIsEnable(true);
-////                    }
-////                    if (workTime.getThursday() && time.dayOfWeek() == 5) {
-////                        dto.setIsEnable(true);
-////                    }
-////                    if (workTime.getFriday() && time.dayOfWeek() == 6) {
-////                        dto.setIsEnable(true);
-////                    }
-////                    if (workTime.getSaturday() && time.dayOfWeek() == 7) {
-////                        dto.setIsEnable(true);
-////                    }
-////                }
-////                if (need != null && need.contains(time.toJdkDate())) {
-////                    dto.setIsEnable(true);
-////                }
-////                workTimeEditDtoList.add(dto);
-////            }
-////            batch(workTime.getOrgId(), date, workTimeEditDtoList);
-////        }
-//    }
-//
-//    @Transactional
-//    public void generateWorkTime(int year, int month) {
-//        Calendar calendar = Calendar.getInstance();
-//        calendar.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-//        calendar.set(Calendar.DAY_OF_MONTH, 1);
-//        calendar.set(Calendar.MONTH, month);
-//        calendar.set(Calendar.YEAR, year);
-//        System.out.println("============================ work_time_job 1================== : " + calendar.getTime());
-//        List<SysWorkTimeSet> workTimes = workTimeSetService.find("year", year);
-//        Map<Long, List<SysWorkTimeSet>> group = workTimes.stream()
-//                .sorted(Comparator.comparing(SysWorkTimeSet::getEffectiveDate).reversed())
-//                .collect(Collectors.groupingBy(w -> w.getOrgId()));
-//
-//        final Date date = DateHelper.getDate(calendar.getTime());
-//        System.out.println("============================ work_time_job 2================== : " + date);
-//        final DateHelper dateTime = new DateHelper(date);
-//        final Date start = dateTime.monthStart();
-//        final Date end = dateTime.monthEnd();
-//        final List<DateTime> dateTimeList = DateUtil.rangeToList(start, end, DateField.DAY_OF_MONTH);
-//        System.out.println(JSON.toJSONString(dateTimeList));
-//        HolidayDto holidayDto = new HolidayDto();
-//        holidayDto.setYear(year);
-//        List<Holiday> holidayList = this.holidayService.all(holidayDto);
-//        List<Date> holidayDates = null;
-//        if (CollectionUtils.isNotEmpty(holidayList)) {
-//            holidayDates = holidayList.stream().map(p -> p.getYmdDate()).collect(Collectors.toList());
-//        }
-//        List<WorkTimeEditDto> workTimeEditDtoList = new ArrayList<>();
-//        for (DateTime time : dateTimeList) {
-//            Date date1 = time.toJdkDate();
-//            System.out.println("date1:" + date1);
-//            for (Long orgId : group.keySet()) {
-//                Optional<WorkTimeSet> ws = group.get(orgId).stream().filter(w -> date1.after(w.getEffectiveDate()) || DateUtil.isSameDay(date1, w.getEffectiveDate())).findFirst();
-//                if (!ws.isPresent()) {
-//                    continue;
-//                }
-//                WorkTimeSet set = ws.get();
-//                WorkTimeSetDayOfWeek dayOfWeekSet = ws.get().getWeekDaySet(time.dayOfWeek());
-//                boolean isEnable = ObjectUtil.isNotNull(dayOfWeekSet) && dayOfWeekSet.getIsWorkday();
-//                WorkTimeEditDto dto = new WorkTimeEditDto();
-//                dto.setDate(time);
-//                dto.setOrgId(orgId);
-//                dto.setIsEnable(isEnable);
-//                if (ObjectUtil.isNull(dayOfWeekSet) || !dayOfWeekSet.getIsWorkday()) {
-//                    Optional<WorkTimeSetDayOfWeek> firstWorkDay = set.getDayOfWeeks().stream().filter(f -> f.getIsWorkday()).findFirst();
-//                    if (firstWorkDay.isPresent()) {
-//                        dayOfWeekSet = firstWorkDay.get();
-//                    }
-//                }
-//                //dto.setIsEnable(dayOfWeekSet.getIsWorkday());
-//                workTimeEditDtoList.add(dto);
-//                dto.setWorkTime(dayOfWeekSet.getWorkTime());
-//                dto.setWorkOffTime(dayOfWeekSet.getWorkOffTime());
-//                dto.setOpenTime(dayOfWeekSet.getOpenTime());
-//                dto.setCloseTime(dayOfWeekSet.getCloseTime());
-//                dto.setNoonbreakStart(dayOfWeekSet.getNoonbreakStart());
-//                dto.setNoonbreakEnd(dayOfWeekSet.getNoonbreakEnd());
-//                workTimeEditDtoList.add(dto);
-//            }
-//        }
-//
-//        Map<Long, List<WorkTimeEditDto>> groupDay = workTimeEditDtoList.stream().collect(Collectors.groupingBy(w -> w.getOrgId()));
-//        //获取所有机构下个月的按日配置的作息
-//        List<WorkTimeNewVo> list = new ArrayList<>();
-//        list = objectMapper.getNextMonthWorkTime(DateUtil.format(start, "yyyy-MM"));
-//        for (Long orgId : groupDay.keySet()) {
-//            List<WorkTimeEditDto> workTimeEditDtos = groupDay.get(orgId);
-//            List<WorkTimeNewVo> workTimeNewVos = list.stream().filter(w -> w.getOrgId().equals(orgId)).collect(Collectors.toList());
-//            //去掉workTimeEditDtos中机构与日期在workTimeNewVos中存在的数据
-//            List<WorkTimeEditDto> list1 = null;
-//            if (CollectionUtils.isNotEmpty(workTimeNewVos)) {
-//                list1 = workTimeEditDtos.stream().filter(s -> {
-//                    return workTimeNewVos.stream().noneMatch(f -> f.getOrgId().equals(s.getOrgId()) && f.getYmdDate().equals(s.getDate()));
-//                }).collect(Collectors.toList());
-//            } else {
-//                list1 = workTimeEditDtos;
-//            }
-//
-//            batch(orgId, date, list1);
-//        }
-////        for (WorkTimeSet workTime : workTimes) {
-////            if (ObjectUtil.isNull(workTime.getOrgId())) {
-////                continue;
-////            }
-////
-////            List<WorkTimeEditDto> workTimeEditDtoList = new ArrayList<>();
-////            List<Holiday> holidays = workTime.getHolidayList();
-////            List<Date> need = new ArrayList<>();
-////            if (CollectionUtils.isNotEmpty(holidays)) {
-////                need = holidays.stream().map(p -> p.getYmdDate()).collect(Collectors.toList());
-////            }
-////            for (DateTime time : dateTimeList) {
-////
-////
-////
-////                boolean isEnable = ObjectUtil.isNotNull(dayOfWeekSet) && dayOfWeekSet.getIsWorkday();
-////                if (ObjectUtil.isNotNull(holidayDates) && holidayDates.contains(time.toJdkDate())) {
-////                    isEnable = false;
-////                }
-////                if (CollectionUtils.isNotEmpty(need) && need.contains(time.toJdkDate())) {
-////                    isEnable = true;
-////                }
-////
-////
-////                if (!isEnable) {
-////                    continue;
-////                }
-////
-////
-////
-////
-//////                if (holidayDates != null && (!holidayDates.contains(time.toJdkDate()))) {
-//////                    if (workTime.getSunday() && time.dayOfWeek() == 1) {
-//////                        dto.setIsEnable(true);
-//////                    }
-//////                    if (workTime.getMonday() && time.dayOfWeek() == 2) {
-//////                        dto.setIsEnable(true);
-//////                    }
-//////                    if (workTime.getTuesday() && time.dayOfWeek() == 3) {
-//////                        dto.setIsEnable(true);
-//////                    }
-//////                    if (workTime.getWednesday() && time.dayOfWeek() == 4) {
-//////                        dto.setIsEnable(true);
-//////                    }
-//////                    if (workTime.getThursday() && time.dayOfWeek() == 5) {
-//////                        dto.setIsEnable(true);
-//////                    }
-//////                    if (workTime.getFriday() && time.dayOfWeek() == 6) {
-//////                        dto.setIsEnable(true);
-//////                    }
-//////                    if (workTime.getSaturday() && time.dayOfWeek() == 7) {
-//////                        dto.setIsEnable(true);
-//////                    }
-//////                }
-//////                if (need != null && need.contains(time.toJdkDate())) {
-//////                    dto.setIsEnable(true);
-//////                }
-////
-////            }
-////            batch(workTime.getOrgId(), date, workTimeEditDtoList);
-////        }
-//    }
-//
-//    public List<WorkTime> batchnew(Long orgId, List<WorkTimeEditDto> workTimeDtoList) {
-//        // 小于现在时间的不允许修改
-//        final Date now = DateUtil.beginOfDay(new Date());
-//        Date updateTime = new Date();
-//        List<WorkTime> workTimeList = StreamHelper.to(workTimeDtoList, workTimeEditDto -> {
-//            final Date workDate = workTimeEditDto.getDate();
-//            if (workTimeEditDto.getIsEnable() == null || workDate.before(now)) {
-//                WORKTIMEBUSINESSLOG.info("作息时间[ {} ]小于现在时间, 不允许改变", workDate);
-//                return null;
-//            }
-//            final WorkTime workTime = WorkTime.of(orgId, workTimeEditDto.getDate());
-//            BeanHelper.copyProperties(workTime, workTimeEditDto);
-//            workTime.setIsManual(true);
-//            workTime.setUpdateTime(updateTime);
-//            return workTime;
-//        }, true);
-//        //
-//        workTimeList = this.workTimeService.save(workTimeList);
-//        return workTimeList;
-//    }
-//
-//    public boolean checkTimeSet() {
-//        boolean flag = true;
-//        LoginUser loginUser = RequestHolder.get().getLoginUser();
-//        Org org = this.orgService.find(loginUser.getOrgId());
-//        boolean isCheck = true;
-//        //非营业网点、离行自助银行、金库和办公大楼不需要提示
-//        if (org.getType() != null && (org.getType().ordinal() != 3 && org.getType().ordinal() != 4 && org.getType().ordinal() != 5 && org.getType().ordinal() != 6)) {
-//            isCheck = false;
-//            //如果是办公大楼
-//        } else {
-//            if (org.getType().ordinal() == 6) {
-//                SystemParame systemParame = systemParameService.findFirstByCode(SystemParameterConstant.OFFICEBUILDING_OPEN_ALLHOURS);
-//                //如果是全天开放
-//                if (systemParame != null && systemParame.getValue().equals("1")) {
-//                    isCheck = false;
-//                }
-//            }
-//        }
-//        if (isCheck) {
-//            List<WorkTimeSet> workTimes = this.workTimeSetService.find("orgId", loginUser.getOrgId());
-//            if (!CollectionUtils.isNotEmpty(workTimes)) {
-//                flag = false;
-//            }
-//        }
-//        return flag;
-//    }
-//}

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -101,8 +101,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE
 			sur.user_id =  #{userId}
 	</select>
+    <select id="selectRoleNameByUserId" resultType="java.lang.String">
+		SELECT DISTINCT
+			GROUP_CONCAT( sr.role_name )
+		FROM
+			sys_user su
+				LEFT JOIN sys_user_role sur ON su.id = sur.user_id
+				LEFT JOIN sys_role sr ON sur.role_id = sr.id
+		WHERE
+			su.id = #{userId}
+	</select>
 
-	<insert id="insertRole" parameterType="com.xunmei.system.api.domain.SysRole" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertRole" parameterType="com.xunmei.system.api.domain.SysRole" useGeneratedKeys="true" keyProperty="id">
  		insert into sys_role(
  			<if test="id != null and id != 0">id,</if>
 		<if test="orgType !=null and orgType != ''"> org_type,</if>

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -391,12 +391,13 @@
     </select>
 
     <select id="getPage" resultType="com.xunmei.system.api.domain.SysUser">
-        select
+        SELECT
+        h.user_id AS is_manager,
         u.id,
         u.dept_id,
         u.is_lock,
         u.job_id,
-        u.name,
+        u.NAME,
         u.username,
         u.org_id,
         u.phone,
@@ -404,13 +405,13 @@
         u.modified_name,
         u.update_time,
         u.modified_id,
-        u.password,
+        u.PASSWORD,
         u.salt,
         u.deleted,
         u.last_ip,
         u.last_time,
-        o.name as org_name,
-        o.path as org_path,
+        o.NAME AS org_name,
+        o.path AS org_path,
         u.image,
         u.card,
         u.gender,
@@ -424,11 +425,13 @@
         u.locked,
         u.create_by,
         u.update_by,
-        u.code,
+        u.CODE,
         u.source,
         u.original_org_id
-        from sys_user u
-        left join  sys_org o on u.original_org_id = o.id
+        FROM
+        sys_user u
+        LEFT JOIN sys_org o ON u.original_org_id = o.id
+        LEFT JOIN ( SELECT user_id FROM sys_user_role uo LEFT JOIN sys_role ro ON uo.role_id = ro.id WHERE ro.role_name LIKE '%安全保卫管理人员' ) h ON h.user_id = u.id
         where 1=1
         <choose>
             <when test="info.checkSub">