Merge remote-tracking branch 'origin/feature/0427-school' into feature/0427-school

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -89,7 +89,15 @@ public class NewsController extends BaseController {
             }
         }
 
-        Map<String, Object> params = new HashMap<String, Object>();
+        // 学校端排除部分条件
+        if (queryInfo.getType() == 29) {
+            // 重置分部编号列表
+            queryInfo.setOrganIdList(null);
+            // 重置分部编号
+            queryInfo.setOrganId(null);
+        }
+
+        Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
         int count = sysNewsInformationDao.queryCount(params);
         if (count == 0) {

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

@@ -38,10 +38,9 @@ public class SchoolStaffWrapper {
         @ApiModelProperty("分页行数")
         private Integer rows;
         
-        @ApiModelProperty("关键字匹配")
+        @ApiModelProperty("老师姓名/编号/手机号")
 		private String keyword;
 
-        @NotNull(message = "合作单位编号不能为空")
         @ApiModelProperty("合作单位编号")
         private Long schoolId;
 

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

@@ -105,6 +105,14 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
             throw new BizException("合作单位编号无效");
         }
 
+        // 合作单位状态判断
+        if (!cooperation.getIsEnable()) {
+            // 删除缓存锁
+            redissonClient.getBucket(submitLockKey).delete();
+
+            throw new BizException("合作单位已禁用");
+        }
+
         // 系统用户信息
         SysUser user = getSysUser(schoolStaff, cooperation);
 

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

@@ -38,10 +38,10 @@
 	
 	<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO cooperation_organ_linkman
-		(id_,cooperation_organ_id_,linkman_,mobile_no_,job_,create_time_,tenant_id_)
+		(id_,cooperation_organ_id_,linkman_,mobile_no_,job_,create_time_,tenant_id_,logo_)
 		VALUES
 		<foreach collection="list" item="item" separator=",">
-		(#{item.id},#{item.cooperationOrganId},#{item.linkman},#{item.mobileNo},#{item.job},#{item.createTime},#{item.tenantId})
+		(#{item.id},#{item.cooperationOrganId},#{item.linkman},#{item.mobileNo},#{item.job},#{item.createTime},#{item.tenantId},#{item.logo})
 		</foreach>
 	</insert>