From c29da66759965fbc6e99c84bf1cf9ac1a7451019 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Mon, 12 Dec 2022 13:41:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data_base_design/天泽数据大平台.pdb         |  4 ++--
 data_base_design/天泽数据大平台.pdm         |  4 ++--
 doc/sql/mysql/tianze-pro-update.sql                |  2 +-
 .../ibeetl/jlw/entity/UniversitiesColleges.java    | 14 +++++++-------
 .../jlw/service/UniversitiesCollegesService.java   |  2 +-
 .../jlw/web/query/UniversitiesCollegesQuery.java   | 10 +++++-----
 .../main/resources/sql/jlw/universitiesColleges.md | 12 ++++++------
 .../static/js/jlw/universitiesColleges/index.js    |  2 +-
 .../templates/jlw/universitiesColleges/add.html    |  2 +-
 9 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/data_base_design/天泽数据大平台.pdb b/data_base_design/天泽数据大平台.pdb
index b929c9dc..7fe7492a 100644
--- a/data_base_design/天泽数据大平台.pdb
+++ b/data_base_design/天泽数据大平台.pdb
@@ -6967,8 +6967,8 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 </o:Column>
 <o:Column Id="o231">
 <a:ObjectID>582CB19E-41FA-42EB-9563-BBB922F28716</a:ObjectID>
-<a:Name>universities_cdolleges_default_admin_user_id</a:Name>
-<a:Code>universities_cdolleges_default_admin_id</a:Code>
+<a:Name>universities_colleges_default_admin_user_id</a:Name>
+<a:Code>universities_colleges_default_admin_id</a:Code>
 <a:CreationDate>1665754161</a:CreationDate>
 <a:Creator>lx</a:Creator>
 <a:ModificationDate>1665757315</a:ModificationDate>
diff --git a/data_base_design/天泽数据大平台.pdm b/data_base_design/天泽数据大平台.pdm
index fc9126c9..eb16d694 100644
--- a/data_base_design/天泽数据大平台.pdm
+++ b/data_base_design/天泽数据大平台.pdm
@@ -6967,8 +6967,8 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 </o:Column>
 <o:Column Id="o231">
 <a:ObjectID>582CB19E-41FA-42EB-9563-BBB922F28716</a:ObjectID>
-<a:Name>universities_cdolleges_default_admin_user_id</a:Name>
-<a:Code>universities_cdolleges_default_admin_id</a:Code>
+<a:Name>universities_colleges_default_admin_user_id</a:Name>
+<a:Code>universities_colleges_default_admin_id</a:Code>
 <a:CreationDate>1665754161</a:CreationDate>
 <a:Creator>lx</a:Creator>
 <a:ModificationDate>1665757315</a:ModificationDate>
diff --git a/doc/sql/mysql/tianze-pro-update.sql b/doc/sql/mysql/tianze-pro-update.sql
index 9d9a79f2..b5588ea2 100644
--- a/doc/sql/mysql/tianze-pro-update.sql
+++ b/doc/sql/mysql/tianze-pro-update.sql
@@ -150,7 +150,7 @@ CREATE TABLE `teacher_open_course_knowledge_point_relation` (
 
 
 # 院校增加默认管理员
-ALTER TABLE universities_colleges ADD COLUMN universities_cdolleges_default_admin_user_id bigint(20) COMMENT '院校默认管理员用户ID';
+ALTER TABLE universities_colleges ADD COLUMN universities_colleges_default_admin_user_id bigint(20) COMMENT '院校默认管理员用户ID';
 
 drop table if exists hands_on_simulation_tasks_file;
 
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java
index d44d1187..df92a769 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesColleges.java
@@ -72,10 +72,10 @@ public class UniversitiesColleges extends BaseEntity{
     private String universitiesCollegesAuthCode;
 
     // 院校默认管理员用户ID
-    @Dict(type = "core_user.CODE.1=1")
-    private Long universitiesCdollegesDefaultAdminUserId;
+    @Dict(type = "core_user.code.1=1")
+    private Long universitiesCollegesDefaultAdminUserId;
 
-//    @FetchSql("select * from core_user where id = #universitiesCdollegesDefaultAdminUserId# ")
+//    @FetchSql("select * from core_user where id = #universitiesCollegesDefaultAdminUserId# ")
 //@UpdateIgnore
 //@InsertIgnore
 //    private CoreUser defaultAdminUser;
@@ -268,12 +268,12 @@ public class UniversitiesColleges extends BaseEntity{
         this.universitiesCollegesAuthCode = universitiesCollegesAuthCode;
     }
 
-    public Long getUniversitiesCdollegesDefaultAdminUserId() {
-        return universitiesCdollegesDefaultAdminUserId;
+    public Long getUniversitiesCollegesDefaultAdminUserId() {
+        return universitiesCollegesDefaultAdminUserId;
     }
 
-    public void setUniversitiesCdollegesDefaultAdminUserId(Long universitiesCdollegesDefaultAdminUserId) {
-        this.universitiesCdollegesDefaultAdminUserId = universitiesCdollegesDefaultAdminUserId;
+    public void setUniversitiesCollegesDefaultAdminUserId(Long universitiesCollegesDefaultAdminUserId) {
+        this.universitiesCollegesDefaultAdminUserId = universitiesCollegesDefaultAdminUserId;
     }
 
 //    public CoreUser getDefaultAdminUser() {
diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java
index 00cc27e5..fc750313 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java
@@ -121,7 +121,7 @@ public class UniversitiesCollegesService extends CoreBaseService<UniversitiesCol
             // 用户添加成功后，将用户ID 回传给该学校的默认管理员字段
             UniversitiesColleges u = new UniversitiesColleges();
             u.setUniversitiesCollegesId(universitiesColleges.getUniversitiesCollegesId());
-            u.setUniversitiesCdollegesDefaultAdminUserId(defaultAdminUserId);
+            u.setUniversitiesCollegesDefaultAdminUserId(defaultAdminUserId);
             universitiesCollegesDao.updateTemplateById(u);
         }
     }
diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/UniversitiesCollegesQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/UniversitiesCollegesQuery.java
index dcc82a01..1c74f0f1 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/UniversitiesCollegesQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/UniversitiesCollegesQuery.java
@@ -34,7 +34,7 @@ public class UniversitiesCollegesQuery extends PageParam {
     private Integer universitiesCollegesStatus;
     // 院校默认管理员用户ID
     @Query(name = "默认管理员", display = true, type = TYPE_DICT, dict="core_user.CODE.1=1")
-    private String universitiesCdollegesDefaultAdminUserId;
+    private String universitiesCollegesDefaultAdminUserId;
     @Query(name = "添加时间", display = false)
     private Date addTime;
     @Query(name = "组织机构ID", display = false)
@@ -159,11 +159,11 @@ public class UniversitiesCollegesQuery extends PageParam {
         this.useTypes = useTypes;
     }
 
-    public String getUniversitiesCdollegesDefaultAdminUserId() {
-        return universitiesCdollegesDefaultAdminUserId;
+    public String getUniversitiesCollegesDefaultAdminUserId() {
+        return universitiesCollegesDefaultAdminUserId;
     }
 
-    public void setUniversitiesCdollegesDefaultAdminUserId(String universitiesCdollegesDefaultAdminUserId) {
-        this.universitiesCdollegesDefaultAdminUserId = universitiesCdollegesDefaultAdminUserId;
+    public void setUniversitiesCollegesDefaultAdminUserId(String universitiesCollegesDefaultAdminUserId) {
+        this.universitiesCollegesDefaultAdminUserId = universitiesCollegesDefaultAdminUserId;
     }
 }
diff --git a/web/src/main/resources/sql/jlw/universitiesColleges.md b/web/src/main/resources/sql/jlw/universitiesColleges.md
index 54ca45c9..87d5f87b 100644
--- a/web/src/main/resources/sql/jlw/universitiesColleges.md
+++ b/web/src/main/resources/sql/jlw/universitiesColleges.md
@@ -53,8 +53,8 @@ queryByCondition
       @if(!isEmpty(universitiesCollegesStatus)){
         and t.universities_colleges_status =#universitiesCollegesStatus#
       @}
-      @if(!isEmpty(universitiesCdollegesDefaultAdminUserId)){
-        and t.universities_cdolleges_default_admin_user_id =#universitiesCdollegesDefaultAdminUserId#
+      @if(!isEmpty(universitiesCollegesDefaultAdminUserId)){
+        and t.universities_colleges_default_admin_user_id =#universitiesCollegesDefaultAdminUserId#
       @}
       @if(!isEmpty(addTime)){
         and t.add_time =#addTime#
@@ -136,8 +136,8 @@ getUniversitiesCollegesValues
       @if(!isEmpty(universitiesCollegesStatus)){
         and t.universities_colleges_status =#universitiesCollegesStatus#
       @}
-      @if(!isEmpty(universitiesCdollegesDefaultAdminUserId)){
-        and t.universities_cdolleges_default_admin_user_id =#universitiesCdollegesDefaultAdminUserId#
+      @if(!isEmpty(universitiesCollegesDefaultAdminUserId)){
+        and t.universities_colleges_default_admin_user_id =#universitiesCollegesDefaultAdminUserId#
       @}
       @if(!isEmpty(addTime)){
         and t.add_time =#addTime#
@@ -203,8 +203,8 @@ getValuesByQuery
       @if(!isEmpty(universitiesCollegesStatus)){
         and t.universities_colleges_status =#universitiesCollegesStatus#
       @}
-      @if(!isEmpty(universitiesCdollegesDefaultAdminUserId)){
-        and t.universities_cdolleges_default_admin_user_id =#universitiesCdollegesDefaultAdminUserId#
+      @if(!isEmpty(universitiesCollegesDefaultAdminUserId)){
+        and t.universities_colleges_default_admin_user_id =#universitiesCollegesDefaultAdminUserId#
       @}
       @if(!isEmpty(addTime)){
         and t.add_time =#addTime#
diff --git a/web/src/main/resources/static/js/jlw/universitiesColleges/index.js b/web/src/main/resources/static/js/jlw/universitiesColleges/index.js
index 4d2a5a1b..f9f6cea1 100644
--- a/web/src/main/resources/static/js/jlw/universitiesColleges/index.js
+++ b/web/src/main/resources/static/js/jlw/universitiesColleges/index.js
@@ -31,7 +31,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                         title: '院校名称', align: "center"
                     },
                     {
-                        field: 'universitiesCdollegesDefaultAdminUserIdText',
+                        field: 'universitiesCollegesDefaultAdminUserIdText',
                         title: '院校管理员账号', align: "center"
                     },
                     {
diff --git a/web/src/main/resources/templates/jlw/universitiesColleges/add.html b/web/src/main/resources/templates/jlw/universitiesColleges/add.html
index 8a9275e7..2cb8431e 100644
--- a/web/src/main/resources/templates/jlw/universitiesColleges/add.html
+++ b/web/src/main/resources/templates/jlw/universitiesColleges/add.html
@@ -95,7 +95,7 @@
             <div class="layui-inline">
                 <label class="layui-form-label"><span class="req">*</span>用户名：</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="userCode" value="${universitiesColleges.universitiesCdollegesDefaultAdminUserIdText!}" class="layui-input" >
+                    <input type="text" name="userCode" value="${universitiesColleges.universitiesCollegesDefaultAdminUserIdText!}" class="layui-input" >
                 </div>
             </div>
             <div class="layui-inline">