diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index eac0e1b..0375728 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -31,11 +31,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0739e0c..ee57f16 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,18 +8,5 @@
-
-
-
-
-
\ No newline at end of file
+
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index ae739b2..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/mini.iml b/mini.iml
deleted file mode 100644
index 0eea37e..0000000
--- a/mini.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/java/io/v/nutz/activity/controller/site/SiteUnionProcessController.java b/src/main/java/io/v/nutz/activity/controller/site/SiteUnionProcessController.java
index 2347024..8611b0d 100644
--- a/src/main/java/io/v/nutz/activity/controller/site/SiteUnionProcessController.java
+++ b/src/main/java/io/v/nutz/activity/controller/site/SiteUnionProcessController.java
@@ -133,7 +133,7 @@ public class SiteUnionProcessController {
String dyHomeReserve = "9020230075";
// String dyHomeReserve = "2007080352";
//校工会审核人(邓研,苏新荣)
- String schoolReserve = "2007080352,1996070092";
+ String schoolReserve = "1996070092";
// String schoolReserve = "2007080352";
if (isPass){
@@ -151,7 +151,7 @@ public class SiteUnionProcessController {
// msgApi.sendQiyeMsgTemplate(sendUserLoginName,schoolReserve,"场地预约审核",auditUrl,schoolContent);
msgApi.sendMsg(schoolReserve,msgContent);
}
- List list = Lang.list("2007080352", "1996070092");
+ List list = Lang.list("1996070092");
list.forEach(item -> {
msgApi.sendMsg(item,msgContent);
});
diff --git a/src/main/java/io/v/nutz/zgfw/handler/condolence/CondolenceMsgHandler.java b/src/main/java/io/v/nutz/zgfw/handler/condolence/CondolenceMsgHandler.java
index 86ef16d..0ac0e9c 100644
--- a/src/main/java/io/v/nutz/zgfw/handler/condolence/CondolenceMsgHandler.java
+++ b/src/main/java/io/v/nutz/zgfw/handler/condolence/CondolenceMsgHandler.java
@@ -43,7 +43,7 @@ public enum CondolenceMsgHandler {
NutMap nutMap = condolenceService.fetch(sql);
String msg = "您好!" + nutMap.getString("unionname") + "的" + nutMap.getString("username") + "申请的"
+ nutMap.getString("typeName") + "慰问已经提交,请您登录到智慧工会系统职工服务>职工慰问下进行审核。";
- List schoolLoginNames = Lang.list("2007080352", "1996070092", "1987070031");
+ List schoolLoginNames = Lang.list("1996070092", "1987010012");
for (String loginname : schoolLoginNames) {
msgApi.sendMsg(loginname, msg);
}
@@ -94,7 +94,7 @@ public enum CondolenceMsgHandler {
NutMap nutMap = condolenceService.fetch(sql);
String msg = "您好!" + nutMap.getString("unionname") + "的" + nutMap.getString("username") + "申请的"
+ nutMap.getString("typeName") + "慰问分工会主席已经审批通过,请您登录到智慧工会系统职工服务>职工慰问下进行审核。";
- List schoolLoginNames = Lang.list("1986110082", "1996070092", "1987070031");
+ List schoolLoginNames = Lang.list("1986110082", "1996070092", "1987010012");
for (String loginname : schoolLoginNames) {
msgApi.sendMsg(loginname, msg);
}
diff --git a/src/main/java/io/v/nutz/zgfw/handler/condolence/CondolenceToDoHandler.java b/src/main/java/io/v/nutz/zgfw/handler/condolence/CondolenceToDoHandler.java
index 75432e6..7b3d545 100644
--- a/src/main/java/io/v/nutz/zgfw/handler/condolence/CondolenceToDoHandler.java
+++ b/src/main/java/io/v/nutz/zgfw/handler/condolence/CondolenceToDoHandler.java
@@ -140,7 +140,7 @@ public enum CondolenceToDoHandler {
CREATE_SCHOOL_TASK() {
@Override
public void exec(Condolence condolence, String option) {
- List schoolLoginNames = Lang.list("2007080352", "1996070092", "1987070031");
+ List schoolLoginNames = Lang.list("1996070092", "1987010012");
localProcessService.createTask(
"condolence@" + condolence.getId(),
"vice_chairman_review",
diff --git a/src/main/resources/views/platform/zgfw/condolence/apply.html b/src/main/resources/views/platform/zgfw/condolence/apply.html
index 5d81782..e1f1df2 100644
--- a/src/main/resources/views/platform/zgfw/condolence/apply.html
+++ b/src/main/resources/views/platform/zgfw/condolence/apply.html
@@ -102,42 +102,44 @@ layout("/layouts/platform.html"){
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -444,6 +446,11 @@ layout("/layouts/platform.html"){
}*/
},
computed: {
+ showPayeeFields() {
+ const condolenceType = this.typeOptions.find(item => item.id === this.formData.type)
+ const hiddenTypeNames = ['会员结婚慰问', '会员退休离岗慰问']
+ return !condolenceType || !hiddenTypeNames.includes(condolenceType.name)
+ },
goodsAlbumFile() {
const goodsAlbum = this.formData.goodsAlbum
return goodsAlbum && goodsAlbum.length ? goodsAlbum[0] : null
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
index bd65f63..332b180 100644
--- a/target/maven-archiver/pom.properties
+++ b/target/maven-archiver/pom.properties
@@ -1,4 +1,4 @@
-#Created by Apache Maven 3.8.4
+#Created by Apache Maven 3.6.3
groupId=io.v
artifactId=mini
version=5.3.0
diff --git a/target/test-classes/io/v/nutz/WebTestDemo.class b/target/test-classes/io/v/nutz/WebTestDemo.class
deleted file mode 100644
index 312792b..0000000
Binary files a/target/test-classes/io/v/nutz/WebTestDemo.class and /dev/null differ