fix

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CooperationOrgan.java

@@ -84,6 +84,9 @@ public class CooperationOrgan extends BaseEntity {
 
 	@ApiModelProperty(value = "是否全职资源",required = false)
 	private Integer fullJobResource = 1;
+
+	@ApiModelProperty("合作单位logo")
+	private String logo;
 	
 	private List<CooperationOrganLinkman> cooperationOrganLinkmanList = new ArrayList<CooperationOrganLinkman>();
 
@@ -215,6 +218,14 @@ public class CooperationOrgan extends BaseEntity {
 		this.cooperationOrganLinkmanList = cooperationOrganLinkmanList;
 	}
 
+	public String getLogo() {
+		return logo;
+	}
+
+	public void setLogo(String logo) {
+		this.logo = logo;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/SchoolStaffWrapper.java

@@ -14,7 +14,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 import java.util.Optional;
 
 /**
@@ -114,12 +113,6 @@ public class SchoolStaffWrapper {
         @ApiModelProperty(value = "用户名")
         private String username;
 
-        @ApiModelProperty(value = "密码")
-        private String password;
-
-        @ApiModelProperty(value = "随机盐")
-        private String salt;
-
         @ApiModelProperty(value = "手机号")
         private String phone;
 
@@ -174,9 +167,6 @@ public class SchoolStaffWrapper {
         @ApiModelProperty("运营标签")
         private Integer operatingTag;
 
-        @ApiModelProperty(value = "用户角色")
-        private List<Integer> roles;
-
         @ApiModelProperty(value = "联系地址")
         private String contactAddress;
 
@@ -186,18 +176,6 @@ public class SchoolStaffWrapper {
         @ApiModelProperty("证书类型")
         private String certificateType;
 
-        @ApiModelProperty(value = "社保部门id")
-        private Integer deptId;
-
-        @ApiModelProperty(value = "部门ids")
-        private String deptIds;
-
-        @ApiModelProperty(value = "岗位id")
-        private String postIds;
-
-        @ApiModelProperty(value = "岗位管理部门")
-        private String postDeptIds;
-
         @ApiModelProperty(value = "银行卡号")
         private String bankCard;
 
@@ -228,6 +206,12 @@ public class SchoolStaffWrapper {
         @ApiModelProperty("机构编号")
         private Integer tenantId;
 
+        @ApiModelProperty("合作单位名称")
+        private String schoolName;
+
+        @ApiModelProperty("合作单位Logo")
+        private String logo;
+
         public static StaffSysUser from(String json) {
             return JSON.parseObject(json, StaffSysUser.class);
         }
@@ -257,5 +241,15 @@ public class SchoolStaffWrapper {
             this.organIdList = organIdList;
             return this;
         }
+
+        public StaffSysUser schoolName(String schoolName) {
+            this.schoolName = schoolName;
+            return this;
+        }
+
+        public StaffSysUser logo(String logo) {
+            this.logo = logo;
+            return this;
+        }
     }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SchoolStaffServiceImpl.java

@@ -96,6 +96,9 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
         // 合作单位编号
         CooperationOrgan cooperation = cooperationOrganService.get(schoolStaff.getSchoolId().intValue());
         if (Objects.isNull(cooperation)) {
+            // 删除缓存锁
+            redissonClient.getBucket(submitLockKey).delete();
+
             throw new BizException("合作单位编号无效");
         }
 
@@ -115,6 +118,9 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
                     .eq(SchoolStaff::getSchoolId, schoolStaff.getSchoolId())
                     .eq(SchoolStaff::getUserType, schoolStaff.getUserType().getCode()).count();
             if (exists > 0) {
+                // 删除缓存锁
+                redissonClient.getBucket(submitLockKey).delete();
+
                 throw new BizException("校长或乐团领队最多添加一人");
             }
         }
@@ -122,10 +128,13 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
         // 学校员工不允许同时存在多个学校ID
         {
             Integer exists = lambdaQuery()
-                    .ne(SchoolStaff::getSchoolId, schoolStaff.getSchoolId())
+                    //.ne(SchoolStaff::getSchoolId, schoolStaff.getSchoolId())
                     .eq(SchoolStaff::getUserId, user.getId())
                     .count();
             if (exists > 0) {
+                // 删除缓存锁
+                redissonClient.getBucket(submitLockKey).delete();
+
                 throw new BizException("用户员工账号已存在");
             }
         }

mec-biz/src/main/resources/config/mybatis/CooperationOrganMapper.xml

@@ -21,6 +21,7 @@
         <result column="update_time_" property="updateTime"/>
         <result column="full_job_resource_" property="fullJobResource"/>
 		<result column="tenant_id_" property="tenantId" />
+        <result column="logo_" property="logo" />
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.entity.CooperationOrgan" id="ExtCooperationOrgan" extends="CooperationOrgan">

mec-web/src/main/java/com/ym/mec/web/controller/school/SchoolStaffController.java

@@ -7,9 +7,11 @@ import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
 import com.ym.mec.biz.dal.entity.SchoolStaff;
 import com.ym.mec.biz.dal.enums.ParamEnum;
 import com.ym.mec.biz.dal.wrapper.SchoolStaffWrapper;
+import com.ym.mec.biz.service.CooperationOrganService;
 import com.ym.mec.biz.service.SchoolStaffService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
@@ -43,6 +45,9 @@ public class SchoolStaffController extends BaseController {
     private SchoolStaffService schoolStaffService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private CooperationOrganService cooperationOrganService;
+
 
 	@ApiOperation(value = "详情", notes = "学校员工-根据详情ID查询单条, 传入id")
     @PreAuthorize("@pcs.hasPermissions('schoolStaff/detail')")
@@ -132,6 +137,13 @@ public class SchoolStaffController extends BaseController {
             user.setResetFlag(true);
         }
 
+        // 学校信息
+        CooperationOrgan cooperation = cooperationOrganService.get(schoolStaff.getSchoolId().intValue());
+        if (Objects.isNull(cooperation)) {
+            throw new BizException("合作单位无效");
+        }
+        user.schoolName(cooperation.getName()).logo(cooperation.getLogo());
+
         return succeed(user);
     }
 }