添加校验

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/position/PositionController.java

@@ -15,6 +15,7 @@ import org.eco.vip.nexus.core.domain.position.pojo.PositionVO;
 import org.eco.vip.nexus.core.service.position.IPositionService;
 import org.eco.vip.orm.pojo.CommonResult;
 import org.eco.vip.orm.pojo.PageResult;
+import org.eco.vip.orm.utils.StrUtils;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -67,6 +68,13 @@ public class PositionController {
     @PostMapping("/edit")
     @SaCheckPermission("system:position:edit")
     public CommonResult<String> edit(@RequestBody @Valid PositionBO positionBO) {
+        if(StrUtils.isBlank(positionBO.getPositionId())) {
+            return fail("职位id不能为空！");
+        }
+        boolean result = positionService.update(positionBO);
+        if (!result) {
+            return fail("更新失败！");
+        }
         return success();
     }
 

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/controller/user/UserController.java

@@ -19,6 +19,7 @@ import org.eco.vip.orm.pojo.CommonResult;
 import org.eco.vip.orm.pojo.LoginUserStorage;
 import org.eco.vip.orm.pojo.PageResult;
 import org.eco.vip.orm.utils.ObjUtils;
+import org.eco.vip.orm.utils.StrUtils;
 import org.eco.vip.security.annotation.PermissionsResource;
 import org.eco.vip.security.utils.LoginHelper;
 import org.springframework.validation.annotation.Validated;
@@ -73,6 +74,9 @@ public class UserController {
     @PostMapping("/edit")
     @SaCheckPermission("system:user:edit")
     public CommonResult<String> edit(@RequestBody @Valid UserBO userBO) {
+        if (StrUtils.isBlank(userBO.getUserId())) {
+            return fail("用户id不能为空！");
+        }
         boolean result = userService.update(userBO);
         if (!result) {
             return fail("更新用户失败！");

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/position/pojo/PositionBO.java

@@ -25,6 +25,11 @@ import org.eco.vip.orm.domain.BaseBO;
 @AutoMapper(target = Position.class, reverseConvertGenerate = false)
 public class PositionBO extends BaseBO {
 
+    /**
+     * 唯一标识
+     */
+    private String positionId;
+
     /**
      * 组织id
      */
@@ -40,7 +45,6 @@ public class PositionBO extends BaseBO {
     /**
      * 分类
      */
-    @NotBlank(message = "category不能为空")
     private String category;
 
     /**

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/user/User.java

@@ -92,4 +92,9 @@ public class User extends BaseEntity {
      * 最后登录时间
      */
     private Date loginDate;
+
+    /**
+     * 是否锁定数据1锁定0不锁定
+     */
+    private String isLock;
 }

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/user/pojo/UserBO.java

@@ -23,6 +23,11 @@ import org.eco.vip.orm.domain.BaseBO;
 @AutoMapper(target = User.class, reverseConvertGenerate = false)
 public class UserBO extends BaseBO {
 
+    /**
+     * userID
+     */
+    private String userId;
+
     /**
      * 组织ID
      */

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/domain/user/pojo/UserVO.java

@@ -91,4 +91,9 @@ public class UserVO extends BaseEntity {
      * 最后登录时间
      */
     private Date loginDate;
+
+    /**
+     * 是否锁定数据1锁定0不锁定
+     */
+    private String isLock;
 }

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/position/PositionService.java

@@ -69,7 +69,8 @@ public class PositionService extends BaseService<PositionMapper, Position> imple
 
     @Override
     public boolean update(PositionBO positionBO) {
-        return false;
+        Position position = MapstructUtils.convert(positionBO, Position.class);
+        return this.updateById(position);
     }
 
     @Override
@@ -79,6 +80,7 @@ public class PositionService extends BaseService<PositionMapper, Position> imple
 
     @Override
     public PositionVO selectById(String id) {
-        return null;
+        QueryWrapper queryWrapper = query().where(POSITION.POSITION_ID.eq(id));
+        return this.getOneAs(queryWrapper, PositionVO.class);
     }
 }

eco-nexus-core/nexus-core-biz/src/main/java/org/eco/vip/nexus/core/service/user/UserService.java

@@ -40,11 +40,11 @@ public class UserService extends BaseService<UserMapper, User> implements IUserS
     @Resource
     private UserRoleMapper userRoleMapper;
 
-
     private QueryWrapper buildQueryWrapper(UserBO userBO) {
         return super.buildBaseQueryWrapper()
                 .and(USER.ACCOUNT.eq(userBO.getAccount()))
                 .and(USER.USER_NAME.eq(userBO.getUserName()))
+                .and(USER.ORG_ID.eq(userBO.getOrgId()))
                 .and(USER.STATUS.eq(userBO.getStatus()))
                 .and(USER.TENANT_ID.eq(userBO.getTenantId()));
     }

eco-start/src/main/resources/db/mysql/V1_0_0_1__sys-init-ddl.sql

@@ -295,6 +295,7 @@ CREATE TABLE `system_user_t`
     `password`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '密码',
     `login_ip`     varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '最后登陆IP',
     `login_date`   datetime NULL DEFAULT NULL COMMENT '最后登陆时间',
+    `is_lock`             varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据锁1：锁定',
     `tenant_id`    varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户编号',
     `status`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态（1正常 0停用）',
     `version`      int NULL DEFAULT NULL COMMENT '乐观锁',
@@ -312,7 +313,7 @@ CREATE TABLE `system_user_t`
 -- ----------------------------
 INSERT INTO `system_user_t`
 VALUES ('1', '', 'superadmin', '超级管理员', 'eco', 'pc_user', NULL, NULL, NULL, NULL,
-        '$2a$10$0dvrBO4B.yyfbLsO3OcDUOaaRf8XklJG6Tyn.6fh907KtxBpzvwo6', NULL, NULL, '1', NULL, 0, '0', '1',
+        '$2a$10$0dvrBO4B.yyfbLsO3OcDUOaaRf8XklJG6Tyn.6fh907KtxBpzvwo6', NULL, NULL, '1', '1', '1', 0, '0', '1',
         '2025-07-10 14:55:25', '1', '2025-07-10 14:55:21', NULL);
 
 -- ----------------------------