角色權限

apply/apply-service/src/main/java/com/hungraim/ltc/dao/ChDisableInfoChangeMapper.java

@@ -21,7 +21,7 @@ public interface ChDisableInfoChangeMapper extends BaseMapper<ChDisableInfoChang
                                                        @Param("districtArea") String districtArea,
                                                        @Param("realName") String realName,
                                                        @Param("certiCode") String certiCode,
-                                                       @Param("aplOrganName") String aplOrganName,
+                                                       @Param("aplOrganName") String srvOrganName,
                                                        @Param("applyStatus") Short applyStatus);
     /**
      * 失能信息变更-查看修改

apply/apply-service/src/main/java/com/hungraim/ltc/service/DisableService.java

@@ -127,7 +127,7 @@ public interface DisableService {
      */
     Page<DisableInfoChangeVo> ListDisInfoChangeExamine(Page<DisableInfoChangeVo> page,
                                                        Long organId, Boolean isChildGroup, String districtProvincial, String districtCity, String districtArea,
-                                                       String realName, String certiCode, String aplOrganName, Short applyStatus);
+                                                       String realName, String certiCode, String srvOrganName, Short applyStatus);
 
     /**
      * 失能人员信息变更-查看修改

apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/DisableServiceImpl.java

@@ -464,7 +464,7 @@ public class DisableServiceImpl implements DisableService {
     @Override
     public Page<DisableInfoChangeVo> ListDisInfoChangeExamine(Page<DisableInfoChangeVo> page,
                                                               Long organId, Boolean isChildGroup, String districtProvincial, String districtCity, String districtArea,
-                                                              String realName, String certiCode, String aplOrganName, Short applyStatus) {
+                                                              String realName, String certiCode, String srvOrganName, Short applyStatus) {
         List<Long> organIds = null;
         if (organId != null) {
             if (isChildGroup == null) {
@@ -474,7 +474,7 @@ public class DisableServiceImpl implements DisableService {
             organIds = organService.getOrganIds(organId, isChildGroup);
         }
         return chDisableInfoChangeMapper.getListDisableInfoChange(page, organIds, districtProvincial
-                , districtCity, districtArea, realName, certiCode, aplOrganName, applyStatus);
+                , districtCity, districtArea, realName, certiCode, srvOrganName, applyStatus);
     }
 
     @Override

apply/apply-service/src/main/resources/mapper/DisableInfoChangeMapper.xml

@@ -47,8 +47,8 @@
             <if test="certiCode != null and certiCode != ''">
                 and change.CERTIF_NUM = #{certiCode}
             </if>
-            <if test="aplOrganName != null and aplOrganName != ''">
-                and srvOrgan.SRV_ORGAN_NAME like CONCAT(CONCAT('%',#{aplOrganName}) ,'%')
+            <if test="srvOrganName != null and srvOrganName != ''">
+                and srvOrgan.SRV_ORGAN_NAME like CONCAT(CONCAT('%',#{srvOrganName}) ,'%')
             </if>
             <if test="applyStatus != null">
                 and change.APPLY_STATUS = #{applyStatus}

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/system/SystemRole.java

@@ -24,5 +24,4 @@ public class SystemRole {
     private Date createdTime;
     private Date updatedTime;
 
-
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/system/SystemUser.java

 package com.hungraim.ltc.pojo.entity.system;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,7 +17,7 @@ import java.util.Date;
 @TableName("LTC_USER")
 public class SystemUser {
 
-    @TableId
+    @TableId( type = IdType.AUTO)
     private Long userId;
     private String account;
     private String password;

system/system-admin-service/src/main/java/com/hungraim/ltc/system/controller/UserController.java

@@ -109,12 +109,13 @@ public class UserController {
         user.setUserStatus(reqUserInfo.getEnable());
         user.setCreatedTime(new Date());
         userInfoService.save(user);
+        Long userId = user.getUserId();
         //初始化权限
         List<Long> roles = reqUserInfo.getRoleIds();
         roles.add(1L);
         List<SystemUserRole> roleList = roles.stream().map(roleId -> {
             SystemUserRole systemUserRole = new SystemUserRole();
-            systemUserRole.setUserId(user.getUserId());
+            systemUserRole.setUserId(userId);
             systemUserRole.setRoleId(roleId);
             return systemUserRole;
         }).collect(Collectors.toList());