feat: bug-726 LDAP同步过来的用户不能重置密码，因为登录使用的是LDAP的密码

2、修改刪除用戶的 接口方式

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/UserController.java

@@ -30,7 +30,7 @@ public class UserController extends BaseController {
      * 新增用户
      */
     @PostMapping("add")
-    public ApiResult<Void> add(@Valid @RequestBody UserAddQO request){
+    public ApiResult<Void> add(@Valid @RequestBody UserAddQO request) {
         userControllerService.add(request);
         return ApiResult.success();
     }
@@ -39,7 +39,7 @@ public class UserController extends BaseController {
      * 更新用户
      */
     @PostMapping("update")
-    public ApiResult<Void> update(@Valid @RequestBody UserUpdateQO request){
+    public ApiResult<Void> update(@Valid @RequestBody UserUpdateQO request) {
         userControllerService.update(request);
         return ApiResult.success();
     }
@@ -65,8 +65,8 @@ public class UserController extends BaseController {
      * 删除用户
      */
     @PostMapping("delete")
-    public ApiResult<Void> delete(@Valid @NotNull Long id){
+    public ApiResult<Void> delete(@Valid @RequestBody FilterIdQO request) {
-        userControllerService.delete(id);
+        userControllerService.delete(request.getId());
         return ApiResult.success();
     }
 

nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java

@@ -328,8 +328,7 @@ public class StructuralPackageControllerService {
                     packageInfo.setRemark(remark);
                     String version = row.getString(1);
                     VUtil.trueThrowBusinessError(StrUtil.isBlank(version)).throwMessage("版本号不能为空");
-                    VUtil.trueThrowBusinessError(!NumberUtils.isCreatable(version)).throwMessage("版本号无效");
+                    packageInfo.setVersion(version);
-                    packageInfo.setVersion(new BigDecimal(version));
                     VUtil.trueThrowBusinessError(packageService.lambdaQuery()
                                     .eq(WmsStructuralPackage::getNo, packageInfo.getNo())
                                     .eq(WmsStructuralPackage::getVersion, packageInfo.getVersion())

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/FilterIdQO.java

@@ -0,0 +1,16 @@
+package com.nflg.wms.common.pojo.qo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class FilterIdQO {
+
+    /**
+     * 主键ID
+     */
+    @NotNull
+    private Long id;
+}

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackageAddQO.java

@@ -54,8 +54,8 @@ public class PackageAddQO {
     /**
      * 版本号
      */
-    @NotNull
+    @NotBlank
-    private BigDecimal version;
+    private String version;
 
     /**
      * 修改日志

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/UserVO.java

@@ -46,6 +46,11 @@ public class UserVO {
     //职位名称
     private String positionName;
 
+    /**
+     * 来源，0：手动创建；1：LDAP同步
+     */
+    private Integer source;
+
     //创建人
     private String createBy;
 

nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackage.java

@@ -75,7 +75,7 @@ public class WmsStructuralPackage implements Serializable {
     /**
      * 版本号
      */
-    private BigDecimal version;
+    private String version;
 
     /**
      * 修改日志

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UserRoleMapServiceImpl.java

@@ -35,6 +35,16 @@ public class UserRoleMapServiceImpl extends ServiceImpl<UserRoleMapMapper, UserR
     @Transactional
     @Override
     public void authorize(UserAuthorizeQO request, String userName) {
+        //清除旧数据
+        baseMapper.delete(new LambdaQueryWrapper<UserRoleMap>()
+                .eq(UserRoleMap::getRoleId, request.getRoleId()));
+        //保存最新的数据
+        List<UserRoleMap> datas = request.getUserIds().stream().map(userId -> new UserRoleMap()
+                .setRoleId(request.getRoleId())
+                .setUserId(userId)).collect(Collectors.toList());
+        saveBatch(datas);
+
+        /*
         List<UserRoleMap> olds = lambdaQuery().eq(UserRoleMap::getRoleId, request.getRoleId()).list();
         if (CollectionUtil.isNotEmpty(request.getUserIds())) {
             olds.removeIf(map -> request.getUserIds().contains(map.getUserId()));
@@ -49,6 +59,7 @@ public class UserRoleMapServiceImpl extends ServiceImpl<UserRoleMapMapper, UserR
             saveBatch(datas);
             auditLogService.addInsert(UserRoleMap.class, datas, userName);
         }
+        */
     }
 
     @Override

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/UserServiceImpl.java

@@ -78,7 +78,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Override
     public void delete(Long id) {
         User user = getById(id);
-        VUtil.trueThrowBusinessError(Objects.isNull(user)).throwMessage("用户不存在");
+        //VUtil.trueThrowBusinessError(Objects.isNull(user)).throwMessage("用户不存在");
+        if(Objects.isNull(user)) {
+            return;
+        }
         removeById(id);
         auditLogService.addDelete(User.class, user, UserUtil.getUserName());
     }

nflg-wms-repository/src/main/resources/mapper/UserRoleMapMapper.xml

@@ -10,9 +10,11 @@
     </select>
 
     <select id="getAuthorizeUser" resultType="com.nflg.wms.common.pojo.vo.UserVO">
-        select u.*
+        select u.*,c."name" as dept_name
         from user_role_map urm
                  inner join "user" u on urm.user_id = u.id
+                 left join user_interior b on u."id"=b.user_id
+                 left join department c on b.dept_id=c."id"
         where urm.role_id = #{roleId}
     </select>