修改bug

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/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/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/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>