Changes

admin-hanhai-vue/src/views/xcx/ClockinTeamLogList.vue

@@ -11,7 +11,8 @@
           </a-col>
           <a-col :md="6" :sm="12">
             <a-form-item label="姓名">
-              <a-input placeholder="请输入姓名"  v-model="queryParam.name"   />
+              <!-- <a-input placeholder="请输入姓名"  v-model="queryParam.name"   /> -->
+              <j-search-select-tag dict="clockin_auth,name,user_id,del_flag=0" placeholder="请输入姓名" v-model="queryParam.userId"></j-search-select-tag>
             </a-form-item>
           </a-col>
         </a-row>
@@ -133,7 +134,7 @@
             }
           },
           {
-            title:'用户昵称',
+            title:'姓名',
             align:"center",
             dataIndex: 'userId_dictText'
           },
@@ -142,11 +143,13 @@
             align:"center",
             dataIndex: 'teamId_dictText'
           },
+          /*
           {
             title:'姓名',
             align:"center",
             dataIndex: 'name'
           },
+           */
           {
             title:'审核状态',
             align:"center",

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinteamlog/entity/ClockinTeamLog.java

@@ -37,8 +37,10 @@ public class ClockinTeamLog implements Serializable {
     @ApiModelProperty(value = "id")
     private java.lang.String id;
     /**用户标识*/
-    @Excel(name = "用户标识", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
-    @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    // @Excel(name = "用户标识", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    // @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    @Excel(name = "用户标识", width = 15, dictTable = "clockin_auth", dicText = "name", dicCode = "user_id")
+    @Dict(dictTable = "clockin_auth", dicText = "name", dicCode = "user_id")
     @ApiModelProperty(value = "用户标识")
     private java.lang.String userId;
 	/**团队编号*/

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -134,9 +134,11 @@ spring:
       #        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://gz-cdb-4486l6qp.sql.tencentcdb.com:28636/clockin?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
+          url: jdbc:mysql://82.156.46.249:3306/clockin?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
+#          url: jdbc:mysql://gz-cdb-4486l6qp.sql.tencentcdb.com:28636/clockin?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
           username: root
-          password: hhlm.168820241016
+#          password: hhlm.168820241016
+          password: A=8`272A
           driver-class-name: com.mysql.cj.jdbc.Driver
 #          url: jdbc:mysql://43.143.235.33:3306/clockin?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
 #          username: root