Merge remote-tracking branch 'origin/master'

lib/数据更新脚本.txt

@@ -625,3 +625,22 @@ return age;
 END$$
 
 DELIMITER ;
+
+
+
+-- 学习资料库
+alter table dj_workresourcelibrary add SSFL int COMMENT '所属分类';
+alter table dj_workresourcelibrary add CREATEUSERID varchar(36) COMMENT '创建人';
+-- alter table dj_workresourcelibrary add CREATEDATETIME datetime  COMMENT '创建时间';
+alter table dj_workresourcelibrary add UPDATEUSERID varchar(36) COMMENT '修改人';
+alter table dj_workresourcelibrary add UPDATEDATETIME datetime null COMMENT '修改时间';
+
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('007233a7-8d6e-4c31-0001-410323984d7e', 1, '入党申请', 'ssflType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', NULL, '2022-04-01 15:45:10', 'a', 'n');
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('007233a7-8d6e-4c31-0002-410323984d7e', 2, '积极分子', 'ssflType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', NULL, '2022-04-01 15:45:10', 'a', 'n');
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('007233a7-8d6e-4c31-0003-410323984d7e', 3, '发展对象', 'ssflType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', NULL, '2022-04-01 15:45:10', 'a', 'n');
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('007233a7-8d6e-4c31-0004-410323984d7e', 4, '预备党员', 'ssflType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', NULL, '2022-04-01 15:45:10', 'a', 'n');
+INSERT INTO `cf_dictionary` (`DICTIONARYID`, `DICKEY`, `DICVALUE`, `DICTYPEKEY`, `DICTYPE`, `APPLICATIONID`, `DICNOTE`, `OPERATETIME`, `OPERATESTATE`, `SYNCSTATE`) VALUES ('007233a7-8d6e-4c31-0005-410323984d7e', 5, '正式党员', 'ssflType', 2, 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', NULL, '2022-04-01 15:45:10', 'a', 'n');
+
+
+
+

src/main/resources/application.yml

@@ -19,7 +19,7 @@ spring:
       filters: stat
       driver-class-name: com.mysql.cj.jdbc.Driver
       #基本属性
-      url: jdbc:mysql://192.168.0.68:3306/ghscpartybuild?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true
+      url: jdbc:mysql://office.bowintek.com:3306/ghscpartybuild_0912?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true
       username: root
       password: bowin@123
       #配置初始化大小/最小/最大

src/main/resources/mapping/DjWorkresourcelibraryCQuery.xml

@@ -21,7 +21,7 @@
             and f.FILETYPENAME like '%'||#{typename}||'%'
         </if>
         <if test="pFileId == null or pFileId ==''">
-            and f.PARENTTYPEID = ''
+            and f.PARENTTYPEID is null
         </if>
         <if test="typeIds!=null and typeIds.size()!=0">
             and f.FILETYPEID in