bug修改

commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfo.java

@@ -300,6 +300,10 @@ public class SysUserJzgInfo extends BaseModel implements Serializable {
     @Schema(description = "角色名称集合")
     private List<String> roleIds;
 
+    @TableField(exist = false)
+    @Schema(description = "角色名称集合")
+    private List<String> roleNames;
+
     @TableField(exist = false)
     @Schema(description = "密码")
     private String password;

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -243,7 +243,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
                 }
                 if(deptMap.containsKey(sysSystem.getSysCode())){
                     int count = deptMap.get(sysSystem.getSysCode()).size();
-                    sysSystem.setDeptCount(count);
+                    sysSystem.setDeptCount(count - 1); // 不包含租户本身
                 }else{
                     sysSystem.setDeptCount(0);
                 }

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/client/OrgClient.java

@@ -1,7 +1,6 @@
 package com.jzg.quotation.commons.client;
 
 import com.jzg.commons.core.page.HttpResult;
-import com.jzg.commons.entity.action.enums.ActionEnum;
 import com.jzg.commons.entity.agreement.dispatch.dto.PtlAgreementDispatchAfterAction;
 import com.jzg.commons.entity.agreement.dispatch.vo.PtlAgreementDispatchVo;
 import com.jzg.commons.entity.dto.CostAgreementParam;
@@ -125,6 +124,12 @@ public interface OrgClient {
     @GetMapping(value = "userInfo/getUserInfo")
     public HttpResult<SysUserJzgInfo> getUserInfo(String id);
 
+    @GetMapping(value = "userInfo/getUserInfoById")
+    public HttpResult<SysUserJzgInfo> getUserInfoById(String id);
+
+    @PostMapping(value = "receivable/restockInsPlyIncome")
+    public void restockInsPlyIncome(@RequestBody InsOrderAdjust insOrderAdjust);
+
     /**
      * 获取调度动作
      */

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -679,7 +679,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserJzgInfoService.updateBatchById(sysUserJzgInfoList);
         } else {
             for (String id : isEnableVo.getIds()) {
-                SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getUserByUserId(id);
+                SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getById(id);
                 if (sysUserJzgInfo == null) {
                     throw new SystemException("该用户不存在");
                 }
@@ -871,9 +871,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         sysUserJzgInfo.setPassword("******");
         //角色
         List<SysRole> userRole = sysUserRoleService.getUserRole(sysUser.getId());
-        List<String> roleIds = userRole.stream().map(u -> u.getId()).collect(Collectors.toList());
+        List<String> roleIds = userRole.stream().map(SysRole::getId).collect(Collectors.toList());
         sysUserJzgInfo.setRoleIds(roleIds);
-
+        sysUserJzgInfo.setRoleNames(userRole.stream().map(SysRole::getName).collect(Collectors.toList()));
 
         List<SysUserJzgInfoFile> sysUserJzgInfoFile = sysUserJzgInfoFileService.list
                 (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserId, sysUserJzgInfo.getId()));

tenant/organization/src/main/resources/mapper/SysOrganizationMapper.xml

@@ -34,10 +34,16 @@
 
     <select id="getTeamUserPage" resultType="com.jzg.commons.entity.vo.SysOrganizationUserLinkVo">
         SELECT
-        su.*,
-        suji.*,
+        su.id as userId,
+        suji.id as id,
+        suji.name as name,
+        su.mobile as mobile,
+        suji.type_attr as typeAttr,
+        suji.status as status,
+        suji.is_enable as isEnable,
+        suji.dept_id as deptId,
         sd.NAME AS dept_name,
-        so.attribute,
+        so.attribute as attribute ,
         ref_suji.name as referrer_name,
         ref_su.mobile as referrer_id,
         led_suji.name as leader_name,

tenant/organization/src/main/resources/mapper/SysUserJzgInfoMapper.xml

@@ -56,7 +56,7 @@
         su.username as leader_name,
         suji.referrer_id,
         su.username as referrer_name,
-        GROUP_CONCAT(sr.name) as role_name,
+        GROUP_CONCAT(DISTINCT sr.name) as role_name,
         soul.organization_id as organization_id,
         so.name as organization_name,
         suji.create_time as createTime,