seer-common/common-enums/src/main/java/com/seer/teach/common/enums/ResultCodeEnum.java

@@ -337,7 +337,6 @@ public enum ResultCodeEnum {
     PARTICIPATION_FAILED(13010, "参与活动失败"),
     PARENT_NOT_FOUND(13011, "家长不存在"),
     INVALID_ACTIVITY_STATUS(13012, "无效的活动状态"),
-    AGENT_NOT_FOUND(13013, "代理商不存在"),
     PARENT_ALREADY_SIGN_UP(130121, "已经报名参加该活动"),
     UNAUTHORIZED_UPDATE_EMPLOYEE(13013, "无权限更新员工信息"),
     DATA_REPEAT_ERROR(130014, "数据重复"),

seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/req/AgentEmployeeRelationReq.java

@@ -3,6 +3,8 @@ package com.seer.teach.mp.admin.controller.req;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import jakarta.validation.constraints.NotNull;
+
 @Schema(name = "AgentEmployeeRelationReq", description = "代理商员工关联请求参数")
 @Data
 public class AgentEmployeeRelationReq {
@@ -10,9 +12,11 @@ public class AgentEmployeeRelationReq {
     @Schema(description = "关联ID")
     private Integer id;
 
+    @NotNull(message = "代理商ID不能为空")
     @Schema(description = "代理商ID")
     private Integer agentId;
 
+    @NotNull(message = "员工用户ID不能为空")
     @Schema(description = "员工用户ID")
     private Integer employeeUserId;
 

seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/req/AgentEmployeeSaveReq.java

@@ -17,11 +17,13 @@ public class AgentEmployeeSaveReq {
     @NotNull(message = "员工名称不能为空")
     private String employeeName;
 
+    @Schema(description = "员工密码")
+    @NotNull(message = "员工密码不能为空")
+    private String password;
+
     @Schema(description = "员工职位")
     private String position;
 
     @Schema(description = "员工状态：0-禁用，1-启用")
     private Integer status = 1;
-
-    private String password;
 }

seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/IAdminAgentEmployeeRelationService.java

@@ -27,7 +27,7 @@ public interface IAdminAgentEmployeeRelationService {
     PageListBean<AgentEmployeeRelationResp> pageList(AgentEmployeeRelationQueryReq query);
 
     /**
-     * 更新代理商员工关联（管理端）
+     * 创建或更新代理商员工关联（管理端）
      *
      * @param request 关联请求对象
      * @return 操作是否成功

seer-user/seer-user-service/src/main/java/com/seer/teach/user/admin/api/UserInfoServiceApiImpl.java

@@ -304,8 +304,10 @@ public class UserInfoServiceApiImpl implements UserInfoServiceApi {
     public Integer getUserIdByUserName(String userName) {
         UserEntity userEntity = userService.getOne(new LambdaQueryWrapper<UserEntity>()
                 .eq(UserEntity::getUserName, userName));
-        AssertUtils.notNull(userEntity, ResultCodeEnum.USER_NOT_FOUND);
+        if (Objects.nonNull(userEntity)) {
-        return userEntity.getId();
+            return userEntity.getId();
+        }
+        return null;
     }
 
     /**