下拉树接口提交和分支冲突解决

base-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java

@@ -1,6 +1,5 @@
 package com.ruoyi.common.datascope.aspect;
 
-import com.ruoyi.common.datascope.context.DataScopeContextHolder;
 import com.usky.system.domain.SysUserVO;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
@@ -88,40 +87,41 @@ public class DataScopeAspect
     public static void dataScopeFilter(JoinPoint joinPoint, SysUserVO user, String deptAlias, String userAlias)
     {
         StringBuilder sqlString = new StringBuilder();
-        StringBuilder sqlLambda = new StringBuilder();
+
         for (SysRoleVO role : user.getRoles())
         {
             String dataScope = role.getDataScope();
             if (DATA_SCOPE_ALL.equals(dataScope))
             {
-                Integer tenantId = SecurityUtils.getTenantId();
-                sqlString.append(StringUtils.format(" OR {}.tenant_id = {} ", deptAlias, tenantId));
-                sqlLambda.append(StringUtils.format(" OR tenant_id = {} ",  tenantId));
+                sqlString = new StringBuilder();
+                break;
             }
             else if (DATA_SCOPE_CUSTOM.equals(dataScope))
             {
-                sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId()));
-                sqlLambda.append(StringUtils.format(" OR dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId()));
+                sqlString.append(StringUtils.format(
+                        " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,
+                        role.getRoleId()));
             }
             else if (DATA_SCOPE_DEPT.equals(dataScope))
             {
                 sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
-                sqlLambda.append(StringUtils.format(" OR dept_id = {} ", user.getDeptId()));
             }
             else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
             {
-                sqlString.append(StringUtils.format( " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, user.getDeptId(), user.getDeptId()));
-                sqlLambda.append(StringUtils.format( " OR dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",  user.getDeptId(), user.getDeptId()));
+                sqlString.append(StringUtils.format(
+                        " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
+                        deptAlias, user.getDeptId(), user.getDeptId()));
             }
             else if (DATA_SCOPE_SELF.equals(dataScope))
             {
-                if (StringUtils.isNotBlank(userAlias)) {
+                if (StringUtils.isNotBlank(userAlias))
+                {
                     sqlString.append(StringUtils.format(" OR {}.create_by = {} ", userAlias, user.getUserName()));
-                    sqlLambda.append(StringUtils.format(" OR create_by = {} ", user.getUserName()));
-                } else {
+                }
+                else
+                {
                     // 数据权限为仅本人且没有userAlias别名不查询任何数据
                     sqlString.append(" OR 1=0 ");
-                    sqlLambda.append(StringUtils.format(" OR create_by = '{}' ", user.getUserName()));
                 }
             }
         }
@@ -135,11 +135,6 @@ public class DataScopeAspect
                 baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
             }
         }
-        if(StringUtils.isNotBlank(sqlLambda.toString())){
-            DataScopeContextHolder.setDataScopeSql(" (" + sqlLambda.substring(4) + ")");
-        }
-
-
     }
 
     /**

base-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/context/DataScopeContextHolder.java

@@ -1,24 +0,0 @@
-package com.ruoyi.common.datascope.context;
-
-public class DataScopeContextHolder {
-
-    /**
-     * 当前租户编号
-     */
-    private static final ThreadLocal<String> DATA_SCOPE_SQL = new ThreadLocal<>();
-
-
-    public static String getDataScopeSql() {
-        return DATA_SCOPE_SQL.get();
-    }
-
-
-    public static void setDataScopeSql(String dataScope) {
-        DATA_SCOPE_SQL.set(dataScope);
-    }
-
-    public static void clear() {
-        DATA_SCOPE_SQL.remove();
-    }
-
-}

base-modules/service-job/pom.xml

@@ -46,12 +46,6 @@
             <artifactId>jaxb-api</artifactId>
             <version>2.3.1</version>
         </dependency>
-
-        <dependency>
-            <groupId>com.usky</groupId>
-            <artifactId>service-fire-api</artifactId>
-            <version>0.0.1</version>
-        </dependency>
         
 
         

base-modules/service-job/src/main/java/com/ruoyi/job/task/RyTask.java

@@ -1,8 +1,5 @@
 package com.ruoyi.job.task;
 
-import com.usky.common.core.utils.SpringUtils;
-import com.usky.fire.RemoteFireService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.usky.common.core.utils.StringUtils;
 
@@ -14,9 +11,6 @@ import com.usky.common.core.utils.StringUtils;
 @Component("ryTask")
 public class RyTask
 {
-    @Autowired
-    private RemoteFireService remoteFireService;
-
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
     {
         System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
@@ -31,9 +25,4 @@ public class RyTask
     {
         System.out.println("执行无参方法");
     }
-
-    public void addPatrolInspectionAbnormalData(){
-        remoteFireService.addPatrolInspectionAbnormalData();
-        System.out.println("addPatrolInspectionAbnormalData");
-    }
 }

base-modules/service-system/service-system-api/src/main/java/com/usky/system/RemoteMceService.java

@@ -4,7 +4,6 @@ package com.usky.system;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.system.factory.RemoteMceFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -23,7 +22,6 @@ public interface RemoteMceService
      * @param mceInfo 消息信息
      * @return 结果
      */
-    @PostMapping(value = "/addMce",produces= MediaType.APPLICATION_JSON_UTF8_VALUE,consumes = "application/json;" +
-            "charset=UTF-8")
+    @PostMapping("/addMce")
     public ApiResult<Void> addMce(@RequestBody String mceInfo);
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/constant/constant.java

@@ -20,8 +20,7 @@ public class constant {
     // 微信公众号推送消息模板id
     public static final String WE_CHAT_TEMPLATE_ID = "FmrNuMzgh0E8bWg1j8a2R3zTmRarHYtZ72TSzPrF9Iw";
     // 微信公众号的消息回调地址（这儿可根据业务需求自定义动作，可选）
-    public static final String WE_CHAT_CUSTOMER_CALL_URL = "https://manager.usky.cn/mobile/#/pages/common/appMessage/index?type=%s&typeName=%s&id=%s";
-    public static final String WE_CHAT_CUSTOMER_CALL_URL1 = "https://manager.usky.cn/mobile/#/pages/common/appMessage/index?type=%s&id=%s";
+    public static final String WE_CHAT_CUSTOMER_CALL_URL = "https://manager.usky.cn/mobile/#/pages/common/appMessage/index?type=%s&id=%s";
     // 微信公众号的主题颜色
     public static final String WE_CHAT_TOP_COLOR = "#A349A4";
     // 微信公众号微信用户授权地址

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/MceReceiveController.java

@@ -115,15 +115,5 @@ public class MceReceiveController {
         mceReceiveService.add(mceReceive);
         return ApiResult.success();
     }
-
-    /**
-     * 删除
-     */
-    @DeleteMapping("/{id}")
-    public ApiResult<Void> removeById(@PathVariable("id") Integer id)
-    {
-        mceReceiveService.removeById(id);
-        return ApiResult.success();
-    }
 }
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysDeptController.java

@@ -79,11 +79,11 @@ public class SysDeptController extends BaseController {
     }
 
     /**
-     * 获取部门下拉树列表
+     * 获取部门人员下拉树列表
      */
     @GetMapping("/deptUserTreeSelect")
     public ApiResult treeselect(SysDept dept, SysUser user) {
-        List<SysDept> depts = deptService.selectDeptList(dept);
+        List<SysDept> depts = deptService.deptList(dept);
         List<SysUser> users = iSysUserService.selectUserList(user);
         return ApiResult.success(deptService.buildDeptUserTreeSelect(depts, users));
     }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TokenController.java

@@ -12,7 +12,10 @@ import com.usky.common.redis.core.RedisHelper;
 import com.usky.common.security.auth.AuthUtil;
 import com.usky.common.security.service.TokenService;
 import com.usky.common.security.utils.SecurityUtils;
-import com.usky.system.domain.*;
+import com.usky.system.domain.MceMbuser;
+import com.usky.system.domain.SysPerson;
+import com.usky.system.domain.SysUser;
+import com.usky.system.domain.SysUserVO;
 import com.usky.system.mapper.SysUserMapper;
 import com.usky.system.model.LoginUser;
 import com.usky.system.service.*;
@@ -54,10 +57,6 @@ public class TokenController {
 
     @Autowired
     private MceMbuserService mceMbuserService;
-
-    @Autowired
-    private MceSettingService mceSettingService;
-
     @Resource
     private HttpServletRequest request;
     @Resource
@@ -119,27 +118,6 @@ public class TokenController {
             }
         }
 
-        LambdaQueryWrapper<MceSetting> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(MceSetting::getCreateBy,userInfo.getUserName());
-        List<MceSetting> list = mceSettingService.list(queryWrapper);
-        if(CollectionUtils.isEmpty(list)){
-            //新增消息设置记录
-            MceSetting mceSetting = new MceSetting();
-            mceSetting.setAppMode("{\"1\":true,\"2\":true,\"3\":true,\"4\":true}");
-            mceSetting.setPcMode("{\"1\":true,\"2\":true,\"3\":true,\"4\":true}");
-            mceSetting.setWcMode("{\"1\":true,\"2\":true,\"3\":true,\"4\":true}");
-
-            mceSetting.setCreateBy(userInfo.getUserName());
-            mceSetting.setCreateTime(LocalDateTime.now());
-            mceSetting.setTenantId(userInfo.getTenantId());
-            long longValue = userInfo.getDeptId();
-            Integer intValue = (int) longValue;
-            mceSetting.setDeptId(intValue);
-            mceSettingService.save(mceSetting);
-        }
-
-
-
         // 获取登录token
         return ApiResult.success(tokenService.createToken(sysUser));
     }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/MceReceive.java

@@ -91,9 +91,5 @@ public class MceReceive implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
-    /**
-     * 发布人
-     */
-    private String issuerName;
 
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/SysDept.java

@@ -3,6 +3,7 @@ package com.usky.system.domain;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.usky.common.core.bean.BaseEntity;
+import com.usky.system.service.vo.TreeNode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -57,6 +58,18 @@ public class SysDept extends BaseEntity
     @TableField(exist = false)
     private String parentName;
 
+    /** 部门成员 */
+    @TableField(exist = false)
+    private List<SysUser> users;
+
+    public List<SysUser> getUsers() {
+        return users;
+    }
+
+    public void setUsers(List<SysUser> users) {
+        this.users = users;
+    }
+
     /**
      * 租户ID
      */

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/SysUser.java

@@ -100,6 +100,18 @@ public class SysUser extends BaseEntity
     /** 姓名 */
     private String fullName;
 
+    /** 岗位 */
+    @TableField(exist = false)
+    private String post;
+
+    public String getPost() {
+        return post;
+    }
+
+    public void setPost(String post) {
+        this.post = post;
+    }
+
     public SysUser()
     {
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysDeptMapper.java

@@ -24,6 +24,8 @@ public interface SysDeptMapper extends BaseMapper<SysDept>
      */
     public List<SysDept> selectDeptList(SysDept dept);
 
+    public List<SysDept> deptList(SysDept dept);
+
     /**
      * 根据角色ID查询部门树信息
      * 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserPostMapper.java

@@ -3,10 +3,13 @@ package com.usky.system.mapper;
 
 import com.usky.common.mybatis.core.CrudMapper;
 import com.usky.system.domain.SysUserPost;
+import com.usky.system.service.vo.UserPostVo;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户与岗位关联表 数据层
@@ -47,4 +50,11 @@ public interface SysUserPostMapper extends CrudMapper<SysUserPost>
      * @return 结果
      */
     public int batchUserPost(List<SysUserPost> userPostList);
+
+    /**
+     * 查询users的职位
+     * @param userIds userIds
+     * @return
+     */
+    public List<UserPostVo> getUserPost(@Param("userIds") List<Long> userIds);
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/ISysDeptService.java

@@ -4,6 +4,7 @@ package com.usky.system.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.usky.system.domain.SysDept;
 import com.usky.system.domain.SysUser;
+import com.usky.system.service.vo.TreeNode;
 import com.usky.system.service.vo.TreeSelect;
 
 import java.util.List;
@@ -23,7 +24,7 @@ public interface ISysDeptService extends IService<SysDept>
      */
     public List<SysDept> selectDeptList(SysDept dept);
 
-    public List<SysDept> selectDeptListByLamda(SysDept dept);
+    public List<SysDept> deptList(SysDept dept);
 
     /**
      * 构建前端所需要树结构
@@ -41,7 +42,12 @@ public interface ISysDeptService extends IService<SysDept>
      */
     public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts);
 
-    List<TreeSelect> buildDeptUserTreeSelect(List<SysDept> depts, List<SysUser> users);
+    /**
+     * 构建前端所需要下拉树结构（部门+人员）
+     * @param depts 部门列表
+     * @return
+     */
+    public List<TreeNode> buildDeptUserTreeSelect(List<SysDept> depts, List<SysUser> users);
 
     /**
      * 根据角色ID查询部门树信息

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/MceReceiveService.java

@@ -28,6 +28,4 @@ public interface MceReceiveService extends CrudService<MceReceive> {
 
     void add(String mceReceive);
 
-    boolean removeById(Integer id);
-
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceContentServiceImpl.java

@@ -46,9 +46,6 @@ public class MceContentServiceImpl extends AbstractCrudService<MceContentMapper,
             sendWeChatMessageRequestVO.setInfoId(mceReceiveId);
             sendWeChatMessageRequestVO.setOpenId(cids);
             sendWeChatMessageRequestVO.setInfoType(mceReceiveVO.get("infoType").toString());
-            if (mceReceiveVO.containsKey("infoTypeName")) {
-                sendWeChatMessageRequestVO.setInfoTypeName(mceReceiveVO.get("infoTypeName").toString());
-            }
             mceMbuserService.sendWeChatMessage(sendWeChatMessageRequestVO);
         }
     }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceMbuserServiceImpl.java

@@ -7,7 +7,6 @@ import com.usky.common.core.exception.BusinessException;
 import com.usky.common.redis.core.RedisHelper;
 import com.usky.system.domain.MceMbuser;
 import com.usky.system.mapper.MceMbuserMapper;
-import com.usky.system.service.ISysDictDataService;
 import com.usky.system.service.MceMbuserService;
 import com.usky.system.constant.constant;
 import com.usky.common.mybatis.core.AbstractCrudService;
@@ -27,7 +26,6 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * <p>
@@ -43,8 +41,6 @@ public class MceMbuserServiceImpl extends AbstractCrudService<MceMbuserMapper, M
 
     @Autowired
     private RedisHelper redisHelper;
-    @Autowired
-    private ISysDictDataService sysDictDataService;
 
     public String getWeChatAccessToken() {
         try {
@@ -76,7 +72,7 @@ public class MceMbuserServiceImpl extends AbstractCrudService<MceMbuserMapper, M
     @Override
     public JSONObject sendWeChatMessage(@RequestBody SendWeChatMessageRequestVO requestVO) {
 
-//        String infoTypeName = sysDictDataService.selectDictLabel("message_type",requestVO.getInfoType());
+        String infoType = requestVO.getInfoType();
         String infoTitle = requestVO.getInfoTitle();
         String infoContent = requestVO.getInfoContent();
         Integer infoId = requestVO.getInfoId();
@@ -111,16 +107,10 @@ public class MceMbuserServiceImpl extends AbstractCrudService<MceMbuserMapper, M
         TemplateMsgEntityVO messageVo=new TemplateMsgEntityVO();
         messageVo.setTTitle(infoTitle);
         messageVo.setTKeyword1(infoContent);
-        messageVo.setTKeyword3(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+//        messageVo.setTKeyword2("测试2");
+//        messageVo.setTKeyword3("测试3");
         messageVo.setTRemark(infoContent);
-        if(Objects.nonNull(requestVO.getInfoTypeName())){
-            messageVo.setTUrl(String.format(constant.WE_CHAT_CUSTOMER_CALL_URL,requestVO.getInfoType(),requestVO.getInfoTypeName(),infoId));
-            messageVo.setTKeyword2(requestVO.getInfoTypeName());
-        }else{
-            messageVo.setTUrl(String.format(constant.WE_CHAT_CUSTOMER_CALL_URL1,requestVO.getInfoType(),infoId));
-            messageVo.setTKeyword2("");
-        }
-
+        messageVo.setTUrl(String.format(constant.WE_CHAT_CUSTOMER_CALL_URL,infoType,infoId));
         messageVo.setTemplateId(constant.WE_CHAT_TEMPLATE_ID);
 
         String requestUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="  + token;
@@ -128,8 +118,8 @@ public class MceMbuserServiceImpl extends AbstractCrudService<MceMbuserMapper, M
         Map<String, TemplateData> data = new HashMap<>();
         data.put("first",new TemplateData(messageVo.getTTitle(),"#44b549"));
         data.put("keyword1",new TemplateData(messageVo.getTKeyword1(),"#173177"));
-        data.put("keyword2",new TemplateData(messageVo.getTKeyword2(),"#173177"));
-        data.put("keyword3",new TemplateData(messageVo.getTKeyword3(),"#173177"));
+//        data.put("keyword2",new TemplateData(messageVo.getTKeyword2(),"#173177"));
+//        data.put("keyword3",new TemplateData(messageVo.getTKeyword3(),"#173177"));
         data.put("remark",new TemplateData(messageVo.getTRemark(),"#173177"));
 
         content.put("touser",openId);

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceReceiveServiceImpl.java

@@ -10,8 +10,6 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.datascope.annotation.DataScope;
-import com.ruoyi.common.datascope.context.DataScopeContextHolder;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.security.utils.SecurityUtils;
@@ -101,32 +99,28 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
     }
 
     @Override
-    @DataScope
     public CommonPage<Object> mceManageList(String infoTitle, String infoType, String startTime, String endTime, Integer current, Integer size) {
         List<Object> list = new ArrayList<>();
         IPage<MceContent> page = new Page<>(current, size);
-        //查询消息内容
         LambdaQueryWrapper<MceContent> lambdaQuery1 = Wrappers.lambdaQuery();
-        lambdaQuery1.select(MceContent::getId, MceContent::getInfoTitle, MceContent::getInfoContent, MceContent::getCreateTime,MceContent::getInfoType)
+        lambdaQuery1.select(MceContent::getId, MceContent::getInfoTitle, MceContent::getInfoContent,
+                MceContent::getCreateTime,MceContent::getInfoType)
                 .like(StringUtils.isNotBlank(infoTitle),MceContent::getInfoTitle,infoTitle)
-                .between(StringUtils.isNotBlank(startTime)&&StringUtils.isNotBlank(endTime),MceContent::getCreateTime, startTime,endTime)
+                .between(StringUtils.isNotBlank(startTime)&&StringUtils.isNotBlank(endTime),MceContent::getCreateTime,
+                        startTime,endTime)
                 .eq(StringUtils.isNotBlank(infoType),MceContent::getInfoType, infoType)
-                .apply(DataScopeContextHolder.getDataScopeSql())
-//              .eq(MceContent::getCreateBy,SecurityUtils.getUsername())
-//              .eq(MceContent::getTenantId,SecurityUtils.getTenantId())
-                .orderByDesc(MceContent::getId);
+                .eq(MceContent::getCreateBy,SecurityUtils.getUsername())
+                .eq(MceContent::getTenantId,SecurityUtils.getTenantId());
         page = mceContentService.page(page,lambdaQuery1);
-
         if (CollectionUtils.isNotEmpty(page.getRecords())) {
             List<Integer> contentIds = new ArrayList<>();
             for (int i = 0; i < page.getRecords().size(); i++) {
                 contentIds.add(page.getRecords().get(i).getId());
             }
             QueryWrapper<MceReceive> queryWrapper = Wrappers.query();
-            queryWrapper.select("content_id AS contentId","COUNT(read_flag=0 or null) as notReadCount","COUNT" +
-                    "(read_flag=1 or null) as readCount","issuer_name AS issuerName")
+            queryWrapper.select("content_id AS contentId","COUNT(read_flag=0 or null) as notReadCount","COUNT(read_flag=1 or null) as readCount")
                     .in("content_id",contentIds)
-                    .groupBy("content_id","issuer_name");
+                    .groupBy("content_id");
             List<Map<String,Object>> readStatisticList = this.listMaps(queryWrapper);
             for (int i = 0; i < page.getRecords().size(); i++) {
                 Map<String, Object> map = new HashMap<>();
@@ -139,13 +133,11 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
                     if (page.getRecords().get(i).getId().equals(readStatisticList.get(j).get("contentId"))){
                         map.put("notReadCount", readStatisticList.get(j).get("notReadCount"));
                         map.put("readCount", readStatisticList.get(j).get("readCount"));
-                        map.put("userName", readStatisticList.get(j).get("issuerName"));
                     }
                 }
                 list.add(map);
             }
         }
-
         return new CommonPage<>(list,page.getTotal(),page.getCurrent(),page.getSize());
     }
 
@@ -220,16 +212,6 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
         this.update(updateWrapper);
     }
 
-    public static List<Integer> convertObjectToList(Object object) {
-        if (object instanceof List<?>) {
-            @SuppressWarnings("unchecked")
-            List<Integer> tempList = (List<Integer>) object;
-            return tempList;
-        } else {
-            throw new IllegalArgumentException("The object is not a List");
-        }
-    }
-
     @Override
     public void add(String mceReceive){
         JSONObject mceReceiveVO = JSONObject.parseObject(mceReceive);
@@ -250,50 +232,38 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
             for (int g = 0; g < list.size(); g++) {
                 userIds.add(list.get(g).getUserId().intValue());
             }
-            List<Integer> userIds1;
-            if (mceReceiveVO.containsKey("userIds")) {
-                userIds1 = convertObjectToList(mceReceiveVO.get("userIds"));
-                userIds.retainAll(userIds1);
-            }
             LambdaQueryWrapper<MceMbuser> lambdaQuery3 = Wrappers.lambdaQuery();
             lambdaQuery3.in(MceMbuser::getUserId,userIds);
             List<MceMbuser> list3 = mceMbuserService.list(lambdaQuery3);
             for (int i = 0; i < list.size(); i++) {
-                if (CollectionUtils.isNotEmpty(list3)){
-                    for (int j = 0; j < list3.size(); j++) {
-                        if (list.get(i).getUserId().equals(list3.get(j).getUserId())){
-                            MceReceive mceReceive1 = new MceReceive();
-                            mceReceive1.setReceiverId(list.get(i).getUserId().intValue());
-                            mceReceive1.setContentId(contentId);
-                            mceReceive1.setReadFlag(0);
-                            mceReceive1.setInfoType(mceReceiveVO.get("infoType").toString());
-                            mceReceive1.setModuleId((int)mceReceiveVO.get("id"));
-                            if (mceReceiveVO.containsKey("userName")) {
-                                mceReceive1.setIssuerName(mceReceiveVO.get("userName").toString());
-                            }
-                            mceReceive1.setReceiverName(list.get(i).getUserName());
-                            mceReceive1.setCreateBy(SecurityUtils.getUsername());
-                            mceReceive1.setCreateTime(LocalDateTime.now());
-                            mceReceive1.setTenantId(list.get(i).getTenantId());
+                MceReceive mceReceive1 = new MceReceive();
+                mceReceive1.setReceiverId(list.get(i).getUserId().intValue());
+                mceReceive1.setContentId(contentId);
+                mceReceive1.setReadFlag(0);
+                mceReceive1.setInfoType(mceReceiveVO.get("infoType").toString());
+                mceReceive1.setModuleId((int)mceReceiveVO.get("id"));
+                mceReceive1.setReceiverName(list.get(i).getUserName());
+                mceReceive1.setCreateBy(SecurityUtils.getUsername());
+                mceReceive1.setCreateTime(LocalDateTime.now());
+                mceReceive1.setTenantId(list.get(i).getTenantId());
 //                mceReceive1.setDeptId(list.get(i).getDeptId().intValue());
-                            this.save(mceReceive1);
-                            Integer mceReceiveId = mceReceive1.getId();
-                            LambdaQueryWrapper<MceSetting> lambdaQuery = Wrappers.lambdaQuery();
-                            lambdaQuery.eq(MceSetting::getCreateBy,list.get(i).getUserName());
-                            List<MceSetting> list1 = mceSettingService.list(lambdaQuery);
-                            if (CollectionUtils.isNotEmpty(list1)){
-                                JSONObject appMode = JSONObject.parseObject(list1.get(0).getAppMode());
-                                JSONObject wcMode = JSONObject.parseObject(list1.get(0).getWcMode());
-                                if (appMode.get(mceReceiveVO.get("infoType").toString()).equals(true)){
-                                    if (list.get(i).getUserId().equals(list3.get(j).getUserId()) && StringUtils.isNotBlank(list3.get(j).getCids())){
-                                        mceContentService.sendApp(mceReceiveVO,list3.get(j).getCids(),0,0);
-                                    }
-                                }
-                                if (wcMode.get(mceReceiveVO.get("infoType").toString()).equals(true)){
-                                    if (list.get(i).getUserId().equals(list3.get(j).getUserId()) && StringUtils.isNotBlank(list3.get(j).getOpenid())){
-                                        mceContentService.sendApp(mceReceiveVO,list3.get(j).getOpenid(),mceReceiveId,1);
-                                    }
-                                }
+                this.save(mceReceive1);
+                Integer mceReceiveId = mceReceive1.getId();
+                LambdaQueryWrapper<MceSetting> lambdaQuery = Wrappers.lambdaQuery();
+                lambdaQuery.eq(MceSetting::getCreateBy,list.get(i).getUserName());
+                List<MceSetting> list1 = mceSettingService.list(lambdaQuery);
+                if (CollectionUtils.isNotEmpty(list1)){
+                    JSONObject appMode = JSONObject.parseObject(list1.get(0).getAppMode());
+                    JSONObject wcMode = JSONObject.parseObject(list1.get(0).getWcMode());
+                    for (int j = 0; j < list3.size(); j++){
+                        if (appMode.get(mceReceiveVO.get("infoType").toString()).equals(true)){
+                            if (list.get(i).getUserId().equals(list3.get(j).getUserId()) && StringUtils.isNotBlank(list3.get(j).getCids())){
+                                mceContentService.sendApp(mceReceiveVO,list3.get(j).getCids(),0,0);
+                            }
+                        }
+                        if (wcMode.get(mceReceiveVO.get("infoType").toString()).equals(true)){
+                            if (list.get(i).getUserId().equals(list3.get(j).getUserId()) && StringUtils.isNotBlank(list3.get(j).getOpenid())){
+                                mceContentService.sendApp(mceReceiveVO,list3.get(j).getOpenid(),mceReceiveId,1);
                             }
                         }
                     }
@@ -301,12 +271,4 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
             }
         }
     }
-
-    @Override
-    public boolean removeById(Integer id) {
-        LambdaQueryWrapper<MceReceive> lambdaQuery = Wrappers.lambdaQuery();
-        lambdaQuery.eq(MceReceive::getContentId,id);
-        this.remove(lambdaQuery);
-        return mceContentService.removeById(id);
-    }
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDeptServiceImpl.java

@@ -4,7 +4,6 @@ package com.usky.system.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.datascope.annotation.DataScope;
-import com.ruoyi.common.datascope.context.DataScopeContextHolder;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.common.core.exception.BusinessException;
@@ -13,21 +12,21 @@ import com.usky.common.core.util.StringUtils;
 import com.usky.system.domain.SysDept;
 import com.usky.system.domain.SysRole;
 import com.usky.system.domain.SysUser;
+import com.usky.system.domain.SysUserPost;
 import com.usky.system.domain.constants.UserConstants;
-import com.usky.system.factory.RemoteLogFallbackFactory;
 import com.usky.system.mapper.SysDeptMapper;
 import com.usky.system.mapper.SysRoleMapper;
+import com.usky.system.mapper.SysUserPostMapper;
 import com.usky.system.service.ISysDeptService;
+import com.usky.system.service.vo.TreeNode;
 import com.usky.system.service.vo.TreeSelect;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.usky.system.service.vo.UserPostVo;
+import org.omg.CORBA.StringHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 
@@ -38,14 +37,15 @@ import java.util.stream.Collectors;
  */
 @Service
 public class SysDeptServiceImpl extends AbstractCrudService<SysDeptMapper, SysDept> implements ISysDeptService {
-    private static final Logger log = LoggerFactory.getLogger(SysDeptServiceImpl.class);
-
     @Autowired
     private SysDeptMapper deptMapper;
 
     @Autowired
     private SysRoleMapper roleMapper;
 
+    @Autowired
+    private SysUserPostMapper sysUserPostMapper;
+
     /**
      * 查询部门管理数据
      *
@@ -56,29 +56,83 @@ public class SysDeptServiceImpl extends AbstractCrudService<SysDeptMapper, SysDe
     @DataScope(deptAlias = "d")
     public List<SysDept> selectDeptList(SysDept dept) {
         dept.setTenantId(SecurityUtils.getTenantId());
-        log.debug(DataScopeContextHolder.getDataScopeSql());
         return deptMapper.selectDeptList(dept);
     }
 
     @Override
-    @DataScope(deptAlias = "d")
-    public List<SysDept> selectDeptListByLamda(SysDept dept) {
-        LambdaQueryWrapper<SysDept> deptQuery = Wrappers.lambdaQuery();
-        deptQuery.eq(SysDept::getDelFlag, 0);
-        if (dept.getParentId() != null && dept.getParentId() != 0) {
-            deptQuery.eq(SysDept::getParentId, dept.getParentId());
+    public List<SysDept> deptList(SysDept dept) {
+        dept.setTenantId(SecurityUtils.getTenantId());
+        return deptMapper.deptList(dept);
+    }
+
+    /**
+     * 部门人员下拉树
+     * @param depts 部门列表
+     * @param users
+     * @return
+     */
+    @Override
+    public List<TreeNode> buildDeptUserTreeSelect(List<SysDept> depts, List<SysUser> users) {
+        List<Long> userIds = new ArrayList<>();
+        for (SysUser user : users){
+            userIds.add(user.getUserId());
         }
-        if (StringUtils.isNotBlank(dept.getDeptName())){
-            deptQuery.like(SysDept::getDeptName, dept.getDeptName());
+        List<UserPostVo> userPost = sysUserPostMapper.getUserPost(userIds);
+        Map<Long, String> userIdToPostMap = userPost.stream()
+                .collect(Collectors.toMap(UserPostVo::getUserId, UserPostVo::getPostName));
+        users.forEach(user -> user.setPost(userIdToPostMap.get(user.getUserId())));
+        List<SysDept> deptTrees = buildDeptTree2(depts);
+        fillUsersToDepts(deptTrees, users);
+        return deptTrees.stream().map(TreeNode::new).collect(Collectors.toList());
+    }
+
+    private void fillUsersToDepts(List<SysDept> depts, List<SysUser> users) {
+        for (SysDept dept : depts) {
+            if (dept.getChildren() == null || dept.getChildren().isEmpty()) {
+                List<SysUser> deptUsers = filterUsersByDept(users, dept.getDeptId());
+                if (!deptUsers.isEmpty()) {
+                    dept.setUsers(deptUsers);
+                }
+            }
+            if (dept.getChildren() != null) {
+                fillUsersToDepts(dept.getChildren(), users);
+            }
         }
-        if (StringUtils.isNotBlank(dept.getStatus())){
-            deptQuery.eq(SysDept::getStatus, dept.getStatus());
+    }
+
+    private List<SysUser> filterUsersByDept(List<SysUser> users, Long deptId) {
+        return users.stream()
+                .filter(user -> user.getDeptId().equals(deptId))
+                .collect(Collectors.toList());
+    }
+
+    private List<SysDept> buildDeptTree2(List<SysDept> depts) {
+        List<SysDept> returnList = new ArrayList<SysDept>();
+        List<Long> tempList = new ArrayList<Long>();
+        for (SysDept dept : depts) {
+            tempList.add(dept.getDeptId());
+        }
+        for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext(); ) {
+            SysDept dept = (SysDept) iterator.next();
+            if (!tempList.contains(dept.getParentId())) {
+                recursionFn2(depts, dept);
+                returnList.add(dept);
+            }
+        }
+        if (returnList.isEmpty()) {
+            returnList = depts;
         }
-        deptQuery.orderByAsc(SysDept::getParentId, SysDept::getOrderNum)
-                .apply(DataScopeContextHolder.getDataScopeSql());
-        log.debug(DataScopeContextHolder.getDataScopeSql());
+        return returnList;
+    }
 
-        return deptMapper.selectList(deptQuery);
+    private void recursionFn2(List<SysDept> list, SysDept t) {
+        List<SysDept> childList = getChildList(list, t);
+        t.setChildren(childList);
+        for (SysDept tChild : childList) {
+            if (hasChild(list, tChild)) {
+                recursionFn(list, tChild);
+            }
+        }
     }
 
     /**
@@ -120,7 +174,7 @@ public class SysDeptServiceImpl extends AbstractCrudService<SysDeptMapper, SysDe
         return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
-    @Override
+/*    @Override
     public List<TreeSelect> buildDeptUserTreeSelect(List<SysDept> depts, List<SysUser> users) {
         List<SysDept> deptTrees = buildDeptTree(depts);
         List<TreeSelect> treeSelectList = new ArrayList<>();
@@ -141,7 +195,7 @@ public class SysDeptServiceImpl extends AbstractCrudService<SysDeptMapper, SysDe
             treeSelectList.add(treeSelect);
         }
         return treeSelectList;
-    }
+    }*/
 
 
     /**

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysTenantServiceImpl.java

@@ -3,15 +3,12 @@ package com.usky.system.service.impl;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
-import com.usky.system.domain.SysDept;
 import com.usky.system.domain.SysTenant;
 import com.usky.system.mapper.SysTenantMapper;
-import com.usky.system.service.ISysDeptService;
 import com.usky.system.service.SysTenantService;
 import com.usky.system.service.vo.SysTenantOneVo;
 import com.usky.system.service.vo.SysTenantTwoVo;
 import com.usky.system.service.vo.SysTenantVo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -29,9 +26,6 @@ import java.util.UUID;
 @Service
 public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, SysTenant> implements SysTenantService {
 
-    @Autowired
-    private ISysDeptService iSysDeptService;
-
     @Override
     public List<SysTenantVo> getUserData() {
         Integer userId = SecurityUtils.getUserId().intValue();
@@ -99,16 +93,6 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
         sysTenant.setCreateBy(SecurityUtils.getUsername());
         sysTenant.setCreateTime(LocalDateTime.now());
         this.save(sysTenant);
-        Integer tenantId = sysTenant.getId();
-        SysDept sysDept = new SysDept();
-        sysDept.setTenantId(tenantId);
-        sysDept.setDeptName(sysTenant.getTenantName());
-        sysDept.setParentId((long)0);
-        sysDept.setOrderNum("0");
-        sysDept.setEmail(sysTenant.getEmail());
-        sysDept.setPhone(sysTenant.getPhoneNumber());
-        sysDept.setCreateBy(SecurityUtils.getUsername());
-        iSysDeptService.insertDept(sysDept);
     }
 
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/SendWeChatMessageRequestVO.java

@@ -9,11 +9,6 @@ public class SendWeChatMessageRequestVO {
      */
     String infoType;
 
-    /**
-     * 消息类型名称
-     */
-    String infoTypeName;
-
     /**
      * 消息标题
      */

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/TreeNode.java

@@ -0,0 +1,79 @@
+package com.usky.system.service.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.usky.system.domain.SysDept;
+import com.usky.system.domain.SysUser;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @description：TODO
+ * @author： fu
+ * @create： 2024-07-12 13:37
+ */
+@Data
+public class TreeNode implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 节点ID
+     */
+    private Long id;
+
+    /**
+     * 节点名称
+     */
+    private String label;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 用户职位
+     */
+    private String post;
+
+    /**
+     * 子节点
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<TreeNode> children;
+
+    public TreeNode() {
+    }
+
+    public TreeNode(Long id, String label, List<TreeNode> children) {
+        this.id = id;
+        this.label = label;
+        this.children = children;
+    }
+
+    public TreeNode(SysUser user) {
+        this.id = user.getUserId();
+        this.label = user.getNickName();
+        this.avatar = user.getAvatar();
+        this.post = user.getPost();
+        this.children = new ArrayList<>();
+    }
+
+    public TreeNode(SysDept dept) {
+        this.id = dept.getDeptId();
+        this.label = dept.getDeptName();
+        this.children = new ArrayList<>();
+        if (dept.getChildren() != null && !dept.getChildren().isEmpty()) {
+            this.children = dept.getChildren().stream().map(TreeNode::new).collect(Collectors.toList());
+        } else if (dept.getUsers() != null && !dept.getUsers().isEmpty()) {
+            this.children = dept.getUsers().stream().map(TreeNode::new).collect(Collectors.toList());
+        }
+    }
+}
+
+
+

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/UserPostVo.java

@@ -0,0 +1,15 @@
+package com.usky.system.service.vo;
+
+import lombok.Data;
+
+/**
+ * @description：TODO
+ * @author： fu
+ * @create： 2024-07-15 18:37
+ */
+@Data
+public class UserPostVo {
+    private Long userId;
+    private String postName;
+}
+

base-modules/service-system/service-system-biz/src/main/resources/bootstrap.yml

@@ -13,10 +13,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: usky-cloud-nacos:8848
+        server-addr: 172.16.120.165:8848
       config:
         # 配置中心地址
-        server-addr: usky-cloud-nacos:8848
+        server-addr: 172.16.120.165:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/MceReceiveMapper.xml

@@ -17,7 +17,6 @@
         <result column="create_time" property="createTime" />
         <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
-        <result column="issuer_name" property="issuerName" />
     </resultMap>
 
 </mapper>

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -49,6 +49,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 		order by d.parent_id, d.order_num
     </select>
+
+	<select id="deptList" parameterType="com.usky.system.domain.SysDept" resultMap="SysDeptResult">
+		<include refid="selectDeptVo"/>
+		where d.del_flag = '0'
+		<if test="tenantId != null and tenantId != '' and tenantId != 0">
+			AND tenant_id = #{tenantId}
+		</if>
+		order by d.parent_id, d.order_num
+	</select>
     
     <select id="selectDeptListByRoleId" resultType="Integer">
 		select d.dept_id

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysUserPostMapper.xml

@@ -12,23 +12,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<delete id="deleteUserPostByUserId" parameterType="Long">
 		delete from sys_user_post where user_id=#{userId}
 	</delete>
-	
+
 	<select id="countUserPostById" resultType="Integer">
 	    select count(1) from sys_user_post where post_id=#{postId}  
 	</select>
-	
+
 	<delete id="deleteUserPost" parameterType="Long">
  		delete from sys_user_post where user_id in
  		<foreach collection="ids" item="ids" open="(" separator="," close=")">
  			#{ids}
-        </foreach> 
+        </foreach>
  	</delete>
-	
+
 	<insert id="batchUserPost">
 		insert into sys_user_post(user_id, post_id) values
 		<foreach item="item" index="index" collection="list" separator=",">
 			(#{item.userId},#{item.postId})
 		</foreach>
 	</insert>
-	
+
+
+	<select id="getUserPost" resultType="com.usky.system.service.vo.UserPostVo">
+        SELECT
+        u.user_id AS userId,
+        p.post_name AS postName
+        FROM
+        sys_user_post u
+        INNER JOIN
+        sys_post p ON u.post_id = p.post_id
+        WHERE
+        u.user_id IN
+        <foreach collection="userIds" item="userId" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </select>
+
+
 </mapper>