院校问题修复

admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java

@@ -28,7 +28,7 @@ import static com.ibeetl.admin.core.util.enums.GeneralStateEnum.ENABLE;
 @Service
 @Transactional
 @Validated
-public class CoreUserService {
+public class CoreUserService extends CoreBaseService<CoreUser> {
 	@Autowired
 	CoreUserDao coreUserDao;
 	
@@ -80,7 +80,7 @@ public class CoreUserService {
 
 		// 判断用户Code唯一
 		Boolean isNotExist = coreUserDao.createLambdaQuery().andEq(CoreUser::getCode,userCode).count() == 0;
-		Assert.isTrue(isNotExist, "用户Code重复！");
+		Assert.isTrue(isNotExist, "用户名重复！");
 
 		CoreUser user = new CoreUser();
 		user.setName(userCode);
@@ -198,4 +198,5 @@ public class CoreUserService {
 //		consumer.accept(id);
 //		return id;
 //	}
+
 }

web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java

@@ -2,14 +2,17 @@ package com.ibeetl.jlw.entity;
 
 import cn.hutool.core.date.DateTime;
 import cn.jlw.validate.ValidateConfig;
-import com.ibeetl.admin.core.annotation.Dict;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
+import org.beetl.sql.annotation.entity.UpdateIgnore;
 import org.beetl.sql.fetch.annotation.Fetch;
+import org.beetl.sql.fetch.annotation.FetchSql;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
+import java.util.Map;
 
 import static cn.hutool.core.date.DateUtil.date;
 
@@ -71,10 +74,15 @@ public class UniversitiesColleges extends BaseEntity{
 
     private String universitiesCollegesAuthCode;
 
-    // 院校默认管理员用户ID
-    @Dict(type = "core_user.code.1=1")
+    // 院校默认管理员用户ID 字段做废，使用org_id关联的学校，管理员，取时间考前的人员信息
+//    @Dict(type = "core_user.code.1=1")
     private Long universitiesCollegesDefaultAdminUserId;
 
+    @FetchSql("select `code`, `name`, `password` from core_user where org_id = #orgId# and DEL_FLAG = 0 and STATE = 'S1' order by CREATE_TIME asc limit 1 ")
+    @UpdateIgnore
+    @InsertIgnore
+    private Map universitiesCollegesDefaultAdminUserInfo;
+
 //    @FetchSql("select * from core_user where id = #universitiesCollegesDefaultAdminUserId# ")
 //@UpdateIgnore
 //@InsertIgnore
@@ -283,4 +291,12 @@ public class UniversitiesColleges extends BaseEntity{
 //    public void setDefaultAdminUser(CoreUser defaultAdminUser) {
 //        this.defaultAdminUser = defaultAdminUser;
 //    }
+
+    public Map getUniversitiesCollegesDefaultAdminUserInfo() {
+        return universitiesCollegesDefaultAdminUserInfo;
+    }
+
+    public void setUniversitiesCollegesDefaultAdminUserInfo(Map universitiesCollegesDefaultAdminUserInfo) {
+        this.universitiesCollegesDefaultAdminUserInfo = universitiesCollegesDefaultAdminUserInfo;
+    }
 }

web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java

@@ -60,14 +60,34 @@ public class UniversitiesCollegesService extends CoreBaseService<UniversitiesCol
         universitiesCollegesDao.deleteUniversitiesCollegesByIds(ids);
 
         for(int i=0;i<ids.split(",").length;i++){
-            UniversitiesColleges universitiesColleges = this.queryById(Long.parseLong(ids.split(",")[i]));
-
-            CoreOrg coreOrg = new CoreOrg();
-            coreOrg.setId(universitiesColleges.getOrgId());
-            coreOrg.setName(universitiesColleges.getUniversitiesCollegesName());
-            coreOrg.setCode("u_"+universitiesColleges.getUniversitiesCollegesId());
-            coreOrg.setDelFlag(((Integer)1).equals(universitiesColleges.getUniversitiesCollegesStatus())?0:1);
-            orgConsoleService.updateTemplate(coreOrg);
+            final UniversitiesColleges universitiesColleges = this.queryById(Long.parseLong(ids.split(",")[i]));
+            Long orgId = universitiesColleges.getOrgId();
+
+            {
+                CoreOrg coreOrg = new CoreOrg();
+                coreOrg.setId(orgId);
+                coreOrg.setName(universitiesColleges.getUniversitiesCollegesName());
+                coreOrg.setCode("u_"+universitiesColleges.getUniversitiesCollegesId());
+                coreOrg.setDelFlag(((Integer)1).equals(universitiesColleges.getUniversitiesCollegesStatus())?0:1);
+                orgConsoleService.updateTemplate(coreOrg);
+            }
+
+            // 标记删除用户
+            {
+                CoreUser query = new CoreUser();
+                query.setOrgId(orgId);
+                List<CoreUser> coreUserList = coreUserService.getCoreUserList(query);
+
+                List<CoreUser> upList = coreUserList.stream().map(item -> {
+                    CoreUser user = new CoreUser();
+                    user.setId(item.getId());
+                    user.setCode("del_" + item.getCode());
+                    user.setDelFlag(((Integer)1).equals(universitiesColleges.getUniversitiesCollegesStatus())?0:1);
+                    return user;
+                }).collect(Collectors.toList());
+
+                coreUserService.updateBatchTemplate(upList);
+            }
         }
     }
 

web/src/main/resources/static/js/jlw/universitiesColleges/index.js

@@ -31,8 +31,10 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                         title: '院校名称', align: "center"
                     },
                     {
-                        field: 'universitiesCollegesDefaultAdminUserIdText',
-                        title: '院校管理员账号', align: "center"
+                        title: '院校管理员账号', align: "center",
+                        templet: function (d) {
+                            return d.universitiesCollegesDefaultAdminUserInfo ? d.universitiesCollegesDefaultAdminUserInfo.code :'';
+                        },
                     },
                     {
                         field: 'universitiesCollegesGrade',

web/src/main/resources/templates/jlw/universitiesColleges/add.html

@@ -98,11 +98,11 @@
                 <label class="layui-form-label"><span class="req">*</span>用户名：</label>
                 <!--#if(isEmpty(universitiesColleges.universitiesCollegesId)){-->
                 <div class="layui-input-inline">
-                    <input type="text" name="userCode" value="${universitiesColleges.universitiesCollegesDefaultAdminUserIdText}" class="layui-input" >
+                    <input type="text" name="userCode" value="${universitiesColleges.universitiesCollegesDefaultAdminUserInfo.code!''}" class="layui-input" >
                 </div>
                 <!--#}else{-->
                 <div class="layui-input-inline">
-                    <div class="layui-form-mid" >${universitiesColleges.universitiesCollegesDefaultAdminUserIdText}</div>
+                    <div class="layui-form-mid" >${universitiesColleges.universitiesCollegesDefaultAdminUserInfo.code!''}</div>
                 </div>
                 <!--#}-->
 
@@ -115,7 +115,7 @@
                 </div>
                 <!--#}else{-->
                 <div class="layui-input-inline">
-                    <div class="layui-form-mid" >${universitiesColleges.universitiesCollegesDefaultAdminUserIdText}</div>
+                    <div class="layui-form-mid" >${universitiesColleges.universitiesCollegesDefaultAdminUserInfo.password!''}</div>
                 </div>
                 <!--#}-->