Merge remote-tracking branch 'origin/main'

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/dashboard/ProposalDashboardController.java

@@ -59,7 +59,7 @@ public class ProposalDashboardController {
         nodes.add(NutMap.NEW().addv("name", "提案总数").addv("id", "total").addv("type", "total").addv("count", 0));
 
         // 节点
-        ProcessDefine define = processDefineService.getLastByName("JDHTA");
+        ProcessDefine define = processDefineService.getLastByName("JDHTA_NC");
         ProcessModel processModel = processDefineService.processDefineToModel(define);
         List<TaskModel> taskModels = processModel.getTasks();
 

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/query/ProposalQueryChartController.java

@@ -141,7 +141,7 @@ public class ProposalQueryChartController {
                 FROM
                   wf_process_design
                 WHERE
-                  NAME = 'JDHTA'
+                  NAME = 'JDHTA_NC'
                 """);
         sql.setCallback(Sqls.callback.map());
         dao.execute(sql);

src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/transact/ProposalSecondedController.java

@@ -120,6 +120,7 @@ public class ProposalSecondedController {
         Cnd cnd = Cnd.NEW();
 
         cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
+        cnd.and("info.createUserId", "!=", SecurityUtil.getUserId());
 
         if (approval) {
             // 已附议页签只展示当前登录附议人已经处理过的记录。

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java

@@ -179,7 +179,7 @@ public class TeacherCongressDelegatePushController {
                 """);
         sql.setParam("sessionId", sessionId);
         Cnd cnd = Cnd.NEW();
-//        cnd.and("u.member", "=", 1);
+        cnd.and("u.member", "=", 1);
         cnd.and("u.username", "is not", null);
         cnd.andEX("u.id", "not in", userIds);
         cnd.and("tcd.userId", "is", null);