修改bug

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

@@ -87,7 +87,7 @@ public class SysUser extends BaseModel{
      * 生成新用户
      * @return
      */
-    public SysUser(String username,String mobile){
+    public SysUser(String username,String mobile, String identity, String identityTimeStart, String identityTimeEnd){
         this.id = IdGenerate.nextId();
         this.username = username;
         this.mobile = mobile;
@@ -96,5 +96,8 @@ public class SysUser extends BaseModel{
         this.salt = salt;
         this.password = PasswordUtils.encode(this.password,salt);
         this.accountStatus = 1;
+        this.identity = identity;
+        this.identityTimeStart = LocalDate.parse(identityTimeStart);
+        this.identityTimeEnd = LocalDate.parse(identityTimeEnd);
     }
 }

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

@@ -70,18 +70,6 @@ public class SysUserJzgInfo extends BaseModel implements Serializable {
     @Schema(description = "审批意见")
     private String approvalOpinion;
 
-//    @TableField(value = "identity")
-//    @Schema(description = "身份证号")
-//    private String identity;
-//
-//    @TableField(value = "identity_time_start")
-//    @Schema(description = "身份证有效期起期")
-//    private String identityTimeStart;
-//
-//    @TableField(value = "identity_time_end")
-//    @Schema(description = "身份证有效期止期")
-//    private String identityTimeEnd;
-
     @TableField(value = "logout_time")
     @Schema(description = "离职时间")
     private String logoutTime;
@@ -314,6 +302,19 @@ public class SysUserJzgInfo extends BaseModel implements Serializable {
     @Schema(description = "银行卡名称")
     private String bankName;
 
+
+    @TableField(exist = false)
+    @Schema(description = "身份证号")
+    private String identity;
+
+    @TableField(exist = false)
+    @Schema(description = "身份证有效期起期")
+    private String identityTimeStart;
+
+    @TableField(exist = false)
+    @Schema(description = "身份证有效期止期")
+    private String identityTimeEnd;
+
     public SysUserJzgInfo(String userName, SysUser user, String systemCode, String deptId){
         this.userId = user.getId();
         //默认添加管理员账户

commons/src/main/java/com/jzg/commons/entity/scheme/vo/PtlSchemeSaveVo.java

@@ -128,6 +128,12 @@ public class PtlSchemeSaveVo {
         ptlScheme.setEnergyType(collect.stream().filter(x->x.getAttrCode().equals("NewEnergyMark")).findFirst().get().getMin());
 //        ptlScheme.setCarnature(collect.stream().filter(x->x.getAttrCode().equals("CarNatureCode")).findFirst().get().getMin());
 
+        ruleAttrs.forEach(rule->{
+            if(rule.getMin() == null && (rule.getMinArray() == null || rule.getMinArray().length == 0)){
+                throw new ValidateException(rule.getAttrName()+"规则不能为空");
+            }
+        });
+
         ptlScheme.setCarnature(
                 collect.stream()
                 .filter(x -> "CarNatureCode".equals(x.getAttrCode()))

commons/src/main/java/com/jzg/commons/entity/vo/SysOrganizationUserLinkVo.java

@@ -9,7 +9,7 @@ public class SysOrganizationUserLinkVo{
     private String userId;
     private String name;
     private String mobile;
-    private String type;
+    private String typeAttr;
     private String deptId;
     private String deptName;
     private String status;
@@ -17,4 +17,8 @@ public class SysOrganizationUserLinkVo{
     private String isEnable;
     private String manager;
     private String attribute;
+    private String referrerName;
+    private String referrerId;
+    private String leaderName;
+    private String leaderId;
 }

tenant/organization/src/main/java/com/jzg/organization/mapper/SysUserJzgInfoMapper.java

@@ -23,4 +23,6 @@ public interface SysUserJzgInfoMapper extends BaseMapper<SysUserJzgInfo> {
 
     List<SysTennatVo> getTenantList(String userId);
 
+    SysUserJzgInfo getUserJzgInfoByUserId(String userId);
+
 }

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

@@ -24,8 +24,8 @@ public class SysUserJzgInfoServiceImpl extends ServiceImpl<SysUserJzgInfoMapper,
 
     @Override
     public SysUserJzgInfo getUserByUserId(String userId) {
-        return baseMapper.selectOne(new LambdaQueryWrapper<SysUserJzgInfo>()
-                .eq(SysUserJzgInfo::getUserId, userId));
+        SysUserJzgInfo sysUserJzgInfo = baseMapper.getUserJzgInfoByUserId(userId);
+        return sysUserJzgInfo;
     }
 
     @Override

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

@@ -304,7 +304,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 //            throw new SystemException("用户信息已存在,无法添加");
         } else {
             // 如果手机号为新号 重新生成SysUser 设置默认密码
-            SysUser sysUser1 = new SysUser(sysUserVo.getMobile(),sysUserVo.getMobile());
+            SysUser sysUser1 = new SysUser(sysUserVo.getMobile(),sysUserVo.getMobile(),sysUserVo.getIdentity(),sysUserVo.getIdentityTimeStart(),sysUserVo.getIdentityTimeEnd());
             this.save(sysUser1);
             BeanUtils.copyProperties(sysUserVo, sysUserJzgInfo);
             sysUserJzgInfo.setId(IdGenerate.nextId());

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

@@ -33,16 +33,25 @@
     </select>
 
     <select id="getTeamUserPage" resultType="com.jzg.commons.entity.vo.SysOrganizationUserLinkVo">
-        select
-            su.*,
-            suji.*,
-            sd.name as dept_name,
-            so.attribute
-        from sys_organization so
-                          INNER join sys_organization_user_link soul on so.id = soul.organization_id
-                            inner join sys_user su on su.id = soul.user_id
-                          INNER join sys_user_jzg_info suji on suji.user_id = soul.user_id
-                            left join sys_dept sd on suji.dept_id  = sd.id
+        SELECT
+        su.*,
+        suji.*,
+        sd.NAME AS dept_name,
+        so.attribute,
+        ref_suji.name as referrer_name,
+        ref_su.mobile as referrer_id,
+        led_suji.name as leader_name,
+        led_su.mobile as leader_id
+        FROM
+        sys_organization so
+        INNER JOIN sys_organization_user_link soul ON so.id = soul.organization_id
+        INNER JOIN sys_user su ON su.id = soul.user_id
+        INNER JOIN sys_user_jzg_info suji ON suji.user_id = soul.user_id
+        LEFT JOIN sys_dept sd ON suji.dept_id = sd.id
+        left join sys_user_jzg_info ref_suji on ref_suji.id = suji.referrer_id
+        left join sys_user ref_su on ref_su.id = ref_suji.user_id
+        left join sys_user_jzg_info led_suji on led_suji.id = suji.leader_id
+        left join sys_user led_su on led_su.id = led_suji.user_id
         where 1 = 1
         <if test="param.id != null and param.id != ''">
             and so.id = #{param.id}

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

@@ -27,10 +27,11 @@
         *
         FROM
         sys_user_jzg_info suji
+        left join sys_user su on su.id = suji.user_id
         WHERE
         1=1
         <if test="identity != null and identity != ''">
-            AND suji.identity = #{identity}
+            AND su.identity = #{identity}
         </if>
         <if test="userId != null and userId != ''">
             AND suji.user_id = #{userId}
@@ -138,5 +139,17 @@
         AND suji.system_code != 'APP'
     </select>
 
+    <select id="getUserJzgInfoByUserId" resultType="com.jzg.commons.entity.po.SysUserJzgInfo">
+        SELECT
+            *,
+            su.identity,
+            su.identity_time_start,
+            su.identity_time_end
+        FROM
+            sys_user_jzg_info suji
+                LEFT JOIN sys_user su ON suji.user_id = su.id
+        WHERE
+            user_id = #{userId}
+    </select>
 
 </mapper>