commit

src/main/java/com/budwk/app/base/event/role/RoleEventPublisher.java

@@ -1,6 +1,7 @@
 package com.budwk.app.base.event.role;
 
-import org.nutz.mvc.Mvcs;
+import com.budwk.app.base.utils.AppIocUtil;
+import org.nutz.ioc.Ioc;
 
 /**
  * @version 1.0
@@ -12,9 +13,10 @@ import org.nutz.mvc.Mvcs;
 public class RoleEventPublisher {
 
     public static void broadcast(RoleEventMsg event){
-        String[] names = Mvcs.getIoc().getNamesByType(RoleEventListener.class);
+        Ioc ioc = AppIocUtil.get();
+        String[] names = ioc.getNamesByType(RoleEventListener.class);
         for (String name : names) {
-            RoleEventListener listener = Mvcs.getIoc().get(RoleEventListener.class, name);
+            RoleEventListener listener = ioc.get(RoleEventListener.class, name);
             listener.receive(event);
         }
     }

src/main/java/com/budwk/app/flow/handler/FlowUnitManagerHandler.java

@@ -1,5 +1,6 @@
 package com.budwk.app.flow.handler;
 
+import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.flow.engine.AssignmentHandler;
 import com.budwk.app.flow.engine.core.Execution;
@@ -24,6 +25,10 @@ public class FlowUnitManagerHandler implements AssignmentHandler {
     @Override
     public List<String> assign(TaskModel model, Execution execution) {
         String unitId = SecurityUtil.getUnitId();
+        String argsUnitId = execution.getArgs().getStr("argsUnitId");
+        if (StrUtil.isNotBlank(argsUnitId)){
+            unitId = argsUnitId;
+        }
 
         SysRoleService sysRoleService = ServiceContext.find(SysRoleService.class);
         Sys_role role = sysRoleService.getByCode(RoleConstant.UNIT_MANAGER);
@@ -42,7 +47,7 @@ public class FlowUnitManagerHandler implements AssignmentHandler {
 
     @Override
     public String getMessage() {
-        return "获取当前登录用户所在单位负责人";
+        return "获取当前登录用户所在单位负责人（如果argsUnitId存在则查询argsUnitId单位的单位负责人）";
     }
 
     public int getOrder() {

src/main/java/com/budwk/app/sys/controller/SysDataUserPullController.java

@@ -42,7 +42,7 @@ public class SysDataUserPullController {
     @ApiOperation("分页数据")
     @Ok("json:{locked:'password|idCard|mobile'}")
     public Result pageData(@Valid SysDataUserPullPageForm pageForm) {
-        Sql sql = Sqls.create("select us.*,su.`name` AS unit_name from sys_user_source us left join sys_unit su ON su.id = us.unitId $condition");
+        Sql sql = Sqls.create("select * from sys_user_source$condition");
         Cnd cnd = Cnd.NEW();
         cnd.andEX(Sys_user_source::getPullTime, "=", pageForm.getPullTime());
         cnd.and(Cnd.likeEX(Sys_user_source::getUsername, pageForm.getUserName()));
@@ -57,7 +57,7 @@ public class SysDataUserPullController {
         }
         cnd.desc(Sys_user_source::getPullTime);
         sql.setCondition(cnd);
-        Pagination pagination = sysUserPullService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+        Pagination pagination = sysUserPullService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
         return Result.success(pagination);
     }
 

src/main/java/com/budwk/app/sys/controller/SysHomeController.java

@@ -263,35 +263,65 @@ public class SysHomeController {
 //    @CacheDefaults(cacheName = RedisConstant.PLATFORM_REDIS_WKCACHE_PREFIX + "web_news", isHash = true)
 //    @CacheResult(cacheKey = "news", ignoreNull = true, cacheLiveTime = 60 * 60 * 24)
     public Result getNews() {
-        // 定义要爬取的URL
         String domain = "https://gh.hgu.edu.cn";
-        try {
-            // 使用Jsoup连接到URL并获取页面内容
-            Document doc = Jsoup.connect(domain).get();
-
         JSONObject root = new JSONObject();
+        root.set("grassroots", new ArrayList<>());
+        root.set("notices", new ArrayList<>());
+        try {
+            // 工会官网首页栏目结构由外部站点维护，抓取时设置超时，避免首页接口长时间阻塞。
+            Document doc = Jsoup.connect(domain).timeout(5000).get();
+
+            root.set("grassroots", parseWebsiteNews(doc.select(".sec1 .s1-right li a"), domain, false));
+            root.set("notices", parseWebsiteNews(doc.select(".sec2 .dt-list2 li a"), domain, true));
+            return Result.success(root);
+        } catch (Exception e) {
+            log.error(e);
+            return Result.success(root);
+        }
+    }
+
+    /**
+     * 解析工会官网首页新闻栏目。
+     *
+     * @param elements 官网栏目链接节点，工会动态为.sec1 .s1-right li a，通知公告为.sec2 .dt-list2 li a
+     * @param domain   官网域名，用于把info/xxx.htm、/__local/xxx等相对地址补全为可直接打开的绝对地址
+     * @param notice   是否为通知公告；通知公告日期由“年月”和“日”拆分展示，需要单独拼接
+     * @return List<JSONObject>，字段包括title标题、date发布日期、url详情地址，前端直接按数组轮播展示
+     */
+    private List<JSONObject> parseWebsiteNews(Elements elements, String domain, boolean notice) {
         List<JSONObject> newsArray = new ArrayList<>();
-            Elements newsItems = doc.select("table[cellspacing=3] tr");
-            for (Element item : newsItems) {
-				Element aElement = item.select("a").first();
-				if(aElement == null) {
+        for (Element item : elements) {
+            String title = StrUtil.blankToDefault(item.attr("title").trim(), item.select("p,h3").first() == null ? "" : item.select("p,h3").first().text().trim());
+            String url = item.attr("href").trim();
+            if (StrUtil.isBlank(title) || StrUtil.isBlank(url)) {
                 continue;
             }
-				String date = item.select(".timestyle125262").text().trim();
-                String title = aElement.attr("title").trim();
-                String url = aElement.attr("href").trim();
+
+            String date;
+            if (notice) {
+                String day = item.select(".date p").text().trim();
+                String yearMonth = item.select(".date span").text().trim();
+                date = StrUtil.isBlank(yearMonth) ? day : yearMonth + "-" + day;
+            } else {
+                date = item.select("span").text().trim();
+            }
 
             JSONObject node = new JSONObject();
             node.set("title", title);
             node.set("date", date);
-                node.set("url", "https://gh.hgu.edu.cn/" + url);
+            node.set("url", buildWebsiteUrl(domain, url));
             newsArray.add(node);
         }
-            root.set("grassroots", newsArray);
-            return Result.success(root);
-        } catch (Exception e) {
-            log.error(e);
-            return Result.success();
+        return newsArray;
     }
+
+    private String buildWebsiteUrl(String domain, String url) {
+        if (StrUtil.startWithIgnoreCase(url, "http")) {
+            return url;
+        }
+        if (url.startsWith("/")) {
+            return domain + url;
+        }
+        return domain + "/" + url;
     }
 }

src/main/java/com/budwk/app/sys/controller/SysMenuController.java

@@ -391,11 +391,11 @@ public class SysMenuController {
     @At
     @Ok("json")
     @SaCheckPermission("sys.manager.menu.edit")
-    public Object sortDo(@Param("ids") String ids, HttpServletRequest req) {
+    public Object sortDo(@Param("ids") String ids, @Param("platform") String platform, HttpServletRequest req) {
         try {
             String[] menuIds = StringUtils.split(ids, ",");
             int i = 0;
-            sysMenuService.execute(Sqls.create("update sys_menu set location=0"));
+            sysMenuService.execute(Sqls.create("update sys_menu set location=0 where platform = '%s'".formatted(platform)));
             for (String s : menuIds) {
                 if (!Strings.isBlank(s)) {
                     sysMenuService.update(org.nutz.dao.Chain.make("location", i), Cnd.where("id", "=", s));

src/main/java/com/budwk/app/sys/services/impl/SysDataUnitPullServiceImpl.java

@@ -124,7 +124,7 @@ public class SysDataUnitPullServiceImpl extends BaseServiceImpl<Sys_unit> implem
         }
         log.info("本次拉取单位数据，新增{}条，更新{}条", insertList.size(), updateList.size());
         dao().insert(insertList);
-        dao().update(updateList);
+        dao().updateIgnoreNull(updateList);
 
 
     }

src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java

@@ -202,15 +202,17 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
             } else {
                 // 修改现有用户
                 u.setId(user.getId());
+                u.setMember(null);
+                u.setMemberTime(null);
 
                 // 更新会员状态
-                boolean currentIsMember = user.getMember() != null && user.getMember();
+               /* boolean currentIsMember = user.getMember() != null && user.getMember();
 
                 if (!currentIsMember) {
                     addMemberUserIds.add(user.getId());
                 } else{
                     removeMemberUserIds.add(user.getId());
-                }
+                }*/
 
                 needDoUpdateList.add(u);
             }

src/main/java/com/budwk/app/sys/services/impl/SysDataUserIncrUpdateServiceImpl.java

@@ -70,7 +70,7 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic
 
             // 检查是否符合会员条件
             // 1. 用户状态为"在岗"
-            if ("在岗".equals(sysUser.getUserState())) {
+           /* if ("在岗".equals(sysUser.getUserState())) {
                 // 2. 检查聘用方式条件
                 List<String> membershipQualifyingPreparedBy = Arrays.asList("新人事代理", "校聘合同制", "事业编制");
 
@@ -94,7 +94,7 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic
                 }
             } else {
                 sysUser.setMember(false);
-            }
+            }*/
         }
 
         List<List<Sys_user>> splitSysUsers = ListUtil.split(sysUsers, 500);
@@ -117,7 +117,7 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic
         sysRoleService.clearCache();
 
         //比较单位数据
-        List<Sys_unit> sysUnits = dao.query(Sys_unit.class, Cnd.where(Sys_unit::getUnitLevel, "=", 2));
+   /*     List<Sys_unit> sysUnits = dao.query(Sys_unit.class, Cnd.where(Sys_unit::getUnitLevel, "=", 2));
         List<String> sysUnitIds = sysUnits.stream().map(Sys_unit::getId).toList();
 
         //信息中心的数据 转为单位代码 ->单位名称 map
@@ -141,7 +141,7 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic
                 }).toList();
         ThreadUtil.execAsync(() -> {
             dao.insert(insertUnits);
-        });
+        });*/
 
         // 计算设置为会员的人数
         long memberCount = sysUsers.stream().filter(Sys_user::getMember).count();
@@ -152,6 +152,6 @@ public class SysDataUserIncrUpdateServiceImpl implements SysDataUserUpdateServic
             RoleEventPublisher.broadcast(new RoleEventMsg(unitId, RoleConstant.PROPOSAL_BRANCH_SCHOOL_LEADER.name(), RoleEventMsg.RENEW_ROLE));
         }
 
-        return StrUtil.format("增量更新成功,本次更新新入职老师{}人,新增单位{}个,设置为会员{}人。", sysUsers.size(), insertUnits.size(), memberCount);
+        return StrUtil.format("增量更新成功,本次更新新入职老师{}人,新增单位{}个,设置为会员{}人。", sysUsers.size(), 0, memberCount);
     }
 }

src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java

@@ -175,6 +175,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl<Sys_user_source>
 
                 // 设置单位相关信息
                 sysUser.setUnitId(raw.getStr("szdwdm"));
+                sysUser.setUnitName(raw.getStr("szksmc"));
                 sysUser.setPullTime(nowDate);
 
 
@@ -186,7 +187,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl<Sys_user_source>
             dao().insert(latestSourceList);
 
             // 人员的单位数据和数据库的单位数据比较，如果人员里面有单位不存在，去更新单位数据
-            List<String> sourceUnitIds = latestSourceList.stream().map(Sys_user_source::getUnitId).distinct().toList();
+      /*      List<String> sourceUnitIds = latestSourceList.stream().map(Sys_user_source::getUnitId).distinct().toList();
             Sql sql = Sqls.create("select id from sys_unit group by id");
             sql.setCallback(Sqls.callback.strList());
             dao().execute(sql);
@@ -195,7 +196,7 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl<Sys_user_source>
             if (!new HashSet<>(unitIds).containsAll(sourceUnitIds)) {
                 log.info("单位需要更新，正在同步更新");
                 sysDataUnitPullService.updateUnits(unitIds);
-            }
+            }*/
             return nowDate;
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/budwk/app/task/job/SysUserAllRenewJob.java

@@ -43,6 +43,7 @@ public class SysUserAllRenewJob implements Job {
         NutMap conditionGroupMap = (NutMap)jobDataMap.get("conditionGroup");
         if(conditionGroupMap == null || conditionGroupMap.isEmpty()){
             log.error("SysUserAllRenewJob定时任务执行中止，原因：conditionGroup为null");
+            return;
         }
         String conditionGroupStr = Json.toJson(conditionGroupMap).replace("@currentDate", DateUtil.today());
         ConditionGroup conditionGroup = null;
@@ -57,6 +58,6 @@ public class SysUserAllRenewJob implements Job {
         param.setUpdateMode(SysDataUpdateMode.ALL.name());
         param.setConditionGroup(conditionGroup);
 
-        // sysDataUserUpdateService.update(param);
+         sysDataUserUpdateService.update(param);
     }
 }

src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureUserStatisticsController.java

@@ -100,7 +100,9 @@ public class ActivityCultureUserStatisticsController {
         Cnd cnd = Cnd.NEW();
         cnd.and("atp.tissueId", "=", activityId);
         cnd.andEX("atp.unionId", "=", unionId);
-        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(),
+                RoleConstant.SCHOOL_UNION_ADMIN.name(),
+                RoleConstant.SCHOOL_UNION_ACTIVITY_ADMIN.name())) {
             if (List.of(40001, 40002).contains(activity_type)) {
                 cnd.and("atp.unionId", "=", SecurityUtil.getUnionId());
             } else if (activity_type == 40003) {
@@ -157,7 +159,9 @@ public class ActivityCultureUserStatisticsController {
 
         Cnd cnd = Cnd.where("tissue.activity_type", "=", activity_type);
         cnd.and("tissue.projectTypeCode", "!=", 50004);
-        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+        if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(),
+                RoleConstant.SCHOOL_UNION_ADMIN.name(),
+                RoleConstant.SCHOOL_UNION_ACTIVITY_ADMIN.name())) {
             cnd.and("tissue.signUpMethod", "in", List.of(1, 2, 3));
             if (activity_type == 40002) {
                 cnd.and("tissue.unionId", "=", SecurityUtil.getUnionId());

src/main/java/com/budwk/app/zhgh/activity/culture/service/impl/ActivityCultureServiceImpl.java

@@ -131,7 +131,8 @@ public class ActivityCultureServiceImpl extends BaseServiceImpl<ActivityTissue>
 
         SqlExpressionGroup group = new SqlExpressionGroup();
         if (!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(),
-                RoleConstant.SCHOOL_UNION_ADMIN.name())) {
+                RoleConstant.SCHOOL_UNION_ADMIN.name(),
+                RoleConstant.SCHOOL_UNION_ACTIVITY_ADMIN.name())) {
             if (AuthUtil.hasRoleOr(RoleConstant.BRANCH_UNION_ADMIN.name(), RoleConstant.BRANCH_UNION_CHAIRMAN.name())) {
                 group.or("tissue.unionId", "=", SecurityUtil.getUnionId());
             } else if (AuthUtil.hasRole(RoleConstant.CLUB_PRESIDENT.name())) {

src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/controller/ExecutiveCommitteePushController.java

@@ -140,7 +140,7 @@ public class ExecutiveCommitteePushController {
 
             ExecutiveCommitteeConfig config = dao.fetch(ExecutiveCommitteeConfig.class,
                     Cnd.where("teacherMeetId", "=", teacherMeetId));
-    /*        if (ObjectUtil.isEmpty(config)) {
+            if (ObjectUtil.isEmpty(config)) {
                 return Result.error("请先配置基础信息");
             }
             if (config.getFirstStartTime().getTime() > System.currentTimeMillis()) {
@@ -148,7 +148,7 @@ public class ExecutiveCommitteePushController {
             }
             if (config.getFirstEndTime().getTime() < System.currentTimeMillis()) {
                 return Result.error("一次预选已结束");
-            }*/
+            }
 
             int dbCount = dao.count(ExecutiveCommitteeOnePush.class,
                     Cnd.where("teacherMeetId", "=", teacherMeetId)

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/controller/material/GrassrootsCongressMaterialApprovalController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.democratic.grassrootscongress.controller.material;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
@@ -76,7 +77,8 @@ public class GrassrootsCongressMaterialApprovalController {
         Cnd cnd = Cnd.NEW();
         cnd.and("t.taskName", "=", "zlsh");
 
-        if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){
+        if (!StpUtil.hasRole(RoleConstant.SYSADMIN.name()) &&
+            !StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) {
             cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
         }
 

src/main/java/com/budwk/app/zhgh/democratic/grassrootscongress/controller/meeting/GrassrootsCongressMeetingApprovalController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.democratic.grassrootscongress.controller.meeting;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.constant.RoleConstant;
 import com.budwk.app.base.page.Pagination;
@@ -76,7 +77,8 @@ public class GrassrootsCongressMeetingApprovalController {
         Cnd cnd = Cnd.NEW();
         cnd.and("t.taskName", "=", "8384aafd-3cdb-49ab-a11f-c5d145b1672c");
 
-        if(!AuthUtil.hasRole(RoleConstant.SYSADMIN.name())){
+        if (!StpUtil.hasRole(RoleConstant.SYSADMIN.name()) &&
+            !StpUtil.hasRole(RoleConstant.SCHOOL_UNION_ADMIN.name())) {
             cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId()));
         }
 

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

@@ -66,6 +66,7 @@ public class ProposalSecondedController {
         Sql sql = Sqls.create("""
                 SELECT
                     us.unionName,
+                    us.unitId,
                 	info.*,
                 	type.name AS typeName,
                     tcs.fullName AS sessionName,

src/main/java/com/budwk/app/zhgh/democratic/proposal/handler/ProposalMasterUnitAssignmentHandler.java

@@ -60,7 +60,7 @@ public class ProposalMasterUnitAssignmentHandler implements AssignmentHandler {
         }
 
         // 获取负责人
-        Sys_role sysRole = sysRoleService.getByCode(RoleConstant.PROPOSAL_UNIT_LEADER);
+        Sys_role sysRole = sysRoleService.getByCode(RoleConstant.UNIT_MANAGER);
 
         List<Sys_user_role> sysUserRoles = dao.query(Sys_user_role.class, Cnd.where(Sys_user_role::getRoleId, "=", sysRole.getId()).and(Sys_user_role::getUnderTakeId, "=", undertake.getId()));
         List<String> selectUserIds = sysUserRoles.stream().map(Sys_user_role::getUserId).toList();

src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java

@@ -177,6 +177,7 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
                     info.code,
                     info.brief,
                     info.measures,
+                    info.researchFindings,
                     info.createUserName,
                     DATE_FORMAT(info.createTime, '%Y年%m月%d日') AS createTime,
                     info.unitName,
@@ -199,6 +200,8 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         //处理下富文本
         String brief = docData.getString("brief");
         String measures = docData.getString("measures");
+        String researchFindings = docData.getString("researchFindings");
+        docData.put("researchFindings", sysOfficeTemplateUtil.convertRichTextToDocText(researchFindings));
         docData.put("brief", sysOfficeTemplateUtil.convertRichTextToDocText(brief));
         docData.put("measures", sysOfficeTemplateUtil.convertRichTextToDocText(measures));
 
@@ -218,8 +221,27 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
 
         // 按任务节点分组
         Map<String, List<ProcessTaskVO>> taskGroups = doneTaskVos.stream().collect(Collectors.groupingBy(ProcessTaskVO::getDisplayName));
-        docData.putAll(taskGroups);
 
+
+        Optional<List<ProcessTaskVO>> optionalList = taskGroups.entrySet().stream()
+                .filter(entry -> entry.getKey().contains("党委书记审核"))
+                .map(Map.Entry::getValue)
+                .findFirst();
+
+        if (optionalList.isPresent()) {
+            List<ProcessTaskVO> tasks = optionalList.get();
+            docData.put("auditName","党委书记审核");
+            taskGroups.put("auditInfo",tasks);
+        }else{
+            Optional<List<ProcessTaskVO>> optionalList2 = taskGroups.entrySet().stream()
+                    .filter(entry -> entry.getKey().contains("单位负责人审核"))
+                    .map(Map.Entry::getValue)
+                    .findFirst();
+            List<ProcessTaskVO> tasks = optionalList2.get();
+            docData.put("auditName","单位负责人审核");
+            taskGroups.put("auditInfo",tasks);
+        }
+        docData.putAll(taskGroups);
         LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy();
         HtmlRenderPolicy htmlRenderPolicy = new HtmlRenderPolicy();
         htmlRenderPolicy.getConfig().setShowDefaultTableBorderInTableCell(true);
@@ -227,6 +249,7 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         Configure config = Configure.builder()
                 .bind("seconders", policy)
                 .bind("提案附议", policy)
+                .bind("researchFindings", htmlRenderPolicy)
                 .bind("brief", htmlRenderPolicy)
                 .bind("measures", htmlRenderPolicy)
                 .bind("taskFormData.tf_opinion", htmlRenderPolicy)

src/main/java/com/budwk/app/zhgh/democratic/proposal/service/impl/ProposalExportServiceImpl.java

@@ -41,10 +41,7 @@ import org.nutz.lang.util.NutMap;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -193,8 +190,18 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         // 添加序号,去除富文本,获取附议人
         for (int i = 0; i < list.size(); i++) {
             list.get(i).put("index", i + 1);
-            list.get(i).put("brief", HtmlUtil.cleanHtmlTag(list.get(i).getString("brief")));
-            list.get(i).put("measures", HtmlUtil.cleanHtmlTag(list.get(i).getString("measures")));
+            if (StrUtil.isNotBlank(list.get(i).getString("researchFindings"))) {
+                list.get(i).put("researchFindings",
+                        HtmlUtil.unescape(HtmlUtil.cleanHtmlTag(list.get(i).getString("researchFindings")))
+                                .replaceAll("\\s+", " ")
+                                .trim());
+            }
+            list.get(i).put("brief", HtmlUtil.unescape(HtmlUtil.cleanHtmlTag(list.get(i).getString("brief")))
+                    .replaceAll("\\s+", " ")
+                    .trim());
+            list.get(i).put("measures", HtmlUtil.unescape(HtmlUtil.cleanHtmlTag(list.get(i).getString("measures")))
+                    .replaceAll("\\s+", " ")
+                    .trim());
             list.get(i).put("suggestUnits", list.get(i).getString("suggestUnits").replace("[", "").replace("]", ""));
 
 
@@ -211,11 +218,16 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
 
             if (inviteTask != null) {
                 NutMap variable = Json.fromJson(NutMap.class, inviteTask.getVariable());
+                if (StrUtil.isNotBlank(variable.getString("variable"))) {
                     List<NutMap> seconders = variable.getAsList(FlowConst.TASK_FORM_DATA_PREFIX + "seconder", NutMap.class);
                     list.get(i).put("secondedUserNames", seconders.stream().map(v -> v.getString("userName")).collect(Collectors.joining(",")));
                 }
             }
-
+        }
+        List<Map<String, Object>> safeList = list.stream().map(nutMap -> {
+            Map<String, Object> map = new HashMap<>(nutMap);
+            return map;
+        }).collect(Collectors.toList());
         List<ExcelExportEntity> exportEntities = new ArrayList<>();
         exportEntities.add(new ExcelExportEntity("序号", "index", 10));
         exportEntities.add(new ExcelExportEntity("提案编号", "code", 20));
@@ -235,7 +247,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         ExportParams exportParams = new ExportParams();
         exportParams.setType(ExcelType.XSSF);
         exportParams.setTitle(title);
-        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, list);
+        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, safeList);
         CommonDownloadUtil.download(title + ".xlsx", workbook, response);
     }
 
@@ -250,7 +262,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         List<NutMap> list = listMap(sql);
 
         for (NutMap row : list) {
-            String content = HtmlUtil.cleanHtmlTag(StrUtil.blankToDefault(row.getString("masterUnderTakeReply"), ""));
+            String content = HtmlUtil.removeHtmlTag(StrUtil.blankToDefault(row.getString("masterUnderTakeReply"), ""));
             row.put("masterUnderTakeReply", content);
         }
 
@@ -421,6 +433,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
 
         NutMap info = (NutMap) sql.getResult();
         // 处理富文本内容
+        info.put("researchFindings", sysOfficeTemplateUtil.convertRichTextToDocText(info.getString("researchFindings")));
         info.put("brief", sysOfficeTemplateUtil.convertRichTextToDocText(info.getString("brief")));
         info.put("measures", sysOfficeTemplateUtil.convertRichTextToDocText(info.getString("measures")));
 
@@ -478,6 +491,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
                 .bind("seconders", policy)
                 .bind("brief", htmlRenderPolicy)
                 .bind("measures", htmlRenderPolicy)
+                .bind("researchFindings", htmlRenderPolicy)
                 .build();
 
         try {
@@ -541,6 +555,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
                     info.name,
                     info.code,
                     info.researchFindings,
+                    info.suggestUnits,
                     info.brief,
                     info.measures,
                     info.createUserName,
@@ -573,8 +588,18 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         // 添加序号,去除富文本,获取附议人
         for (int i = 0; i < list.size(); i++) {
             list.get(i).put("index", i + 1);
-            list.get(i).put("brief", HtmlUtil.cleanHtmlTag(list.get(i).getString("brief")));
-            list.get(i).put("measures", HtmlUtil.cleanHtmlTag(list.get(i).getString("measures")));
+            if (StrUtil.isNotBlank(list.get(i).getString("researchFindings"))) {
+                list.get(i).put("researchFindings", HtmlUtil.unescape(HtmlUtil.cleanHtmlTag(list.get(i).getString("researchFindings")))
+                        .replaceAll("\\s+", " ")
+                        .trim());
+            }
+            list.get(i).put("brief", HtmlUtil.unescape(HtmlUtil.cleanHtmlTag(list.get(i).getString("brief")))
+                    .replaceAll("\\s+", " ")
+                    .trim());
+            list.get(i).put("measures", HtmlUtil.unescape(HtmlUtil.cleanHtmlTag(list.get(i).getString("measures")))
+                    .replaceAll("\\s+", " ")
+                    .trim());
+            list.get(i).put("suggestUnits", list.get(i).getString("suggestUnits").replace("[", "").replace("]", ""));
 
             // 流程实例
 //            ProcessInstance instance = dao().fetch(ProcessInstance.class, Cnd.where(ProcessInstance::getBusinessNo, "=", list.get(i).getString("id")));
@@ -610,6 +635,11 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
             row.put("instanceState", processInstanceStateMap.get(row.getString("instanceState")));
         }
 
+        List<Map<String, Object>> safeList = list.stream().map(nutMap -> {
+            Map<String, Object> map = new HashMap<>(nutMap);
+            return map;
+        }).collect(Collectors.toList());
+
         List<ExcelExportEntity> exportEntities = new ArrayList<>();
 
         for (ExportTableColumns column : tableColumns) {
@@ -622,7 +652,7 @@ public class ProposalExportServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         ExportParams exportParams = new ExportParams();
         exportParams.setType(ExcelType.XSSF);
         exportParams.setTitle(title);
-        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, list);
+        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, safeList);
         CommonDownloadUtil.download(title + ".xlsx", workbook, response);
     }
 }

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java

@@ -33,6 +33,7 @@ import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.Lang;
 import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
@@ -40,6 +41,7 @@ import org.nutz.mvc.annotation.POST;
 import org.nutz.mvc.annotation.Param;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
@@ -285,6 +287,9 @@ public class TeacherCongressDelegationController {
         }
         if (type.equals("TEACHER_CONGRESS_VICE_DELEGATION_HEAD")){
             List<Record> recordList = dao.query("sys_user_role", Cnd.where("tcSessionId", "=", sessionId).and("tcDelegationId", "=", delegationId).and("roleId", "=", role.getId()));
+            if (Lang.isEmpty(recordList)) {
+                return Result.success(new ArrayList<>());
+            }
             List<String> userIdList = recordList.stream().map(record -> record.getString("userId")).toList();
             String userIds = userIdList.stream()
                     .map(s -> "'" + s + "'")      // 给每个元素加上单引号
@@ -307,7 +312,9 @@ public class TeacherCongressDelegationController {
         }else{
             Record record = dao.fetch("sys_user_role", Cnd.where("tcSessionId", "=", sessionId).and("tcDelegationId", "=", delegationId).and("roleId", "=", role.getId()));
             String userId = Optional.ofNullable(record).map(r -> r.getString("userId")).orElse(null);
-
+            if (Lang.isEmpty(userId)) {
+                return Result.success(new NutMap());
+            }
             Sql sql = Sqls.create("""
                 SELECT
                     u.id as userId,
@@ -338,7 +345,7 @@ public class TeacherCongressDelegationController {
      * @param delegationId  代表团ID
      * @param sessionId     届次ID
      * @param userId        团长id
-     * @param viceUserId    副团长id
+     * @param viceUserIds    副团长id
      * @param contactUserId 联络人
      * @return
      */

src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveFamilyPlanningOfficeAuditController.java

@@ -167,6 +167,7 @@ public class MaternityLeaveFamilyPlanningOfficeAuditController {
 
         maternityLeaveService.update(maternityLeave);
 
+        args.put("argsUnitId",maternityLeave.getUnitId());
         flowCommonService.executeTask(args);
 
         return Result.success();

src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/models/MaternityLeave.java

@@ -1,5 +1,6 @@
 package com.budwk.app.zhgh.staffbenefit.maternityLeave.models;
 
+import cn.hutool.json.JSONObject;
 import com.budwk.app.base.model.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -8,6 +9,7 @@ import org.nutz.dao.interceptor.annotation.PrevInsert;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author : hongqiwei
@@ -188,6 +190,11 @@ public class MaternityLeave extends BaseModel implements Serializable {
     @Comment("是否多胞胎")
     private Boolean isMultipleBirths;
 
+    @Column
+    @Comment("附件")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<JSONObject> files;
+
 
 }
 

src/main/resources/views/layouts/v4/home.html

@@ -1965,7 +1965,7 @@ layout("/layouts/v4/baseLayout.html"){
                             <div class="oa-notice-header-icon">
                                 <i class="fa fa-users"></i>
                             </div>
-                            <h2 class="oa-notice-header-title">基层动态</h2>
+                            <h2 class="oa-notice-header-title">工会动态</h2>
                         </div>
                     </div>
                     <div class="oa-grassroots-content">
@@ -1988,8 +1988,8 @@ layout("/layouts/v4/baseLayout.html"){
                             <div class="oa-empty-state-icon">
                                 <i class="fa fa-users"></i>
                             </div>
-                            <div class="oa-empty-state-title">暂无基层动态</div>
-                            <div class="oa-empty-state-desc">当前没有可用的基层动态内容</div>
+                            <div class="oa-empty-state-title">暂无工会动态</div>
+                            <div class="oa-empty-state-desc">当前没有可用的工会动态内容</div>
                         </div>
                     </div>
                 </div>

src/main/resources/views/layouts/v4/home/index.html

@@ -86,7 +86,7 @@ layout("/layouts/v4/baseLayout.html"){
 
 	    </div>
 
-	    <jcdt :list="websiteNews.grassroots"></jcdt>
+	    <jcdt :grassroots="websiteNews.grassroots" :notices="websiteNews.notices"></jcdt>
     </div>
 
 </div>
@@ -105,6 +105,7 @@ layout("/layouts/v4/baseLayout.html"){
             return{
                 websiteNews:{
                     grassroots:[],
+                    notices:[],
                 }
             }
         },
@@ -122,7 +123,11 @@ layout("/layouts/v4/baseLayout.html"){
             getWebSiteNews(){
                 this.$axios.post('/platform/home/getNews').then(res => {
                     if (res.code === 0) {
-                        this.websiteNews = res.data
+                        const data = res.data || {}
+                        this.websiteNews = {
+                            grassroots: data.grassroots || [],
+                            notices: data.notices || [],
+                        }
                     }
                 })
             }

src/main/resources/views/layouts/v4/home/jcdt.js

@@ -2,28 +2,27 @@ const jcdt = {
     template: /*language=HTML*/ `
         <div class="jcdt-wrapper">
             <div class="jcdt-container">
+                <el-carousel class="jcdt-carousel" height="340px" :interval="10000" indicator-position="none" arrow="always">
+                    <el-carousel-item v-for="section in sections" :key="section.key">
                         <div class="jcdt-title">
-                    <span>基层动态</span>
+                            <span>{{section.title}}</span>
                         </div>
                         <div class="jcdt-content">
-                    <div class="jcdt-list">
-                        <div class="jcdt-item" v-for="item in list" :key="item.title" @click="onLink(item)">
-                            <div class="date" v-if="item.date">{{item.date}}</div>
-                            <div style="display: flex; align-items: center">
-                                <div >
-                                    <el-image style="width: 30px" src="/assets/platform/img/v4/xw.png" alt="流程中心"></el-image>
+                            <div v-if="section.list.length > 0" class="jcdt-list">
+                                <div class="jcdt-item" v-for="item in section.list" :key="item.url || item.title" @click="onLink(item)">
+                                    <div class="date" v-if="item.date">
+                                        <i class="el-icon-alarm-clock"></i>
+                                        <span>{{item.date}}</span>
                                     </div>
+                                    <div class="jcdt-item-main">
                                         <div class="title">{{item.title}}</div>
                                     </div>
-
-                            <!--<div class="image">
-                                <img v-if="item.image" :src="item.image" alt="">
-                                <img v-else src="/assets/platform/img/v4/not-image.png" alt="">
-                            </div>-->
-                            <!--                            <div class="summary">{{item.summary}}</div>-->
                                 </div>
                             </div>
+                            <div v-else class="jcdt-empty">暂无{{section.title}}</div>
                         </div>
+                    </el-carousel-item>
+                </el-carousel>
             </div>
         </div>
     `,
@@ -31,9 +30,29 @@ const jcdt = {
         return {}
     },
     props: {
-        list: {
+        grassroots: {
             type: Array,
-            default: []
+            default: () => []
+        },
+        notices: {
+            type: Array,
+            default: () => []
+        }
+    },
+    computed: {
+        sections() {
+            return [
+                {
+                    key: "grassroots",
+                    title: "工会要闻",
+                    list: (this.grassroots || []).slice(0, 8)
+                },
+                {
+                    key: "notices",
+                    title: "通知公告",
+                    list: (this.notices || []).slice(0, 8)
+                }
+            ]
         }
     },
     methods: {
@@ -54,94 +73,112 @@ const jcdt = {
             width: 80%;
             max-width: 80%;
             margin: 0 auto;
-
             background-color: #FFFFFF;
             border-radius: 12px;
-            padding: 20px;
+            padding: 42px 20px 40px;
             margin-bottom: 10px;
-            box-shadow: 0 6px 20px rgba(0, 0, 0, 0.06);
+            box-shadow: 0 10px 28px rgba(0, 0, 0, 0.08);
         }
 
-        .jcdt-title{
+        .jcdt-carousel {
+            width: 100%;
+        }
+
+        /deep/ .jcdt-carousel .el-carousel__container {
+            height: 340px;
+        }
+
+        /deep/ .jcdt-carousel .el-carousel__item {
+            overflow: visible;
+        }
+
+        /deep/ .jcdt-title{
             font-size: 30px;
             color: #000000;
             display: block;
             font-weight: bold;
             position: relative;
             text-align: center;
-            padding: 20px 0;
+            padding: 0 0 24px;
         }
 
         /deep/ .jcdt-container .jcdt-title span::before {
-            content: '';
-            width: 24px;
-            height: 11px;
-            background: url(https://www.ncu.edu.cn/images/titl.svg) no-repeat center;
-            background-size: 24px 11px;
+            content: '◇';
             display: inline-block;
-            margin-right: 0;
+            margin-right: 8px;
             vertical-align: middle;
+            color: #e60012;
+            font-size: 16px;
+            font-weight: 400;
         }
 
         /deep/ .jcdt-container .jcdt-title span::after {
-            content: '';
-            width: 24px;
-            height: 11px;
-            background: url(https://www.ncu.edu.cn/images/titr.svg) no-repeat center;
-            background-size: 24px 11px;
+            content: '◇';
             display: inline-block;
-            margin-left: 0;
+            margin-left: 8px;
             vertical-align: middle;
+            color: #e60012;
+            font-size: 16px;
+            font-weight: 400;
         }
 
-        .jcdt-list {
+        /deep/ .jcdt-list {
             display: grid;
-            grid-template-columns: repeat(4, 1fr);
+            grid-template-columns: repeat(4, minmax(0, 1fr));
             gap: 20px;
         }
 
-        .jcdt-item {
+        /deep/ .jcdt-item {
             display: flex;
             flex-direction: column;
             padding: 16px;
             border: none;
-            border-bottom: 3px solid transparent;
+            border-bottom: 3px solid #c11623;
             transition: all 0.3s ease;
             cursor: pointer;
-            height: auto;
-
             border-radius: 12px;
-        }
-        
-        .jcdt-item:hover{
+            min-height: 84px;
             background: #ffffff;
-            border-bottom-color: var(--color-primary);
-            transform: translateY(-4px);
-            box-shadow: 0 8px 20px rgba(0, 0, 0, 0.15);
+            box-shadow: 0 8px 18px rgba(0, 0, 0, 0.08);
         }
 
-        .jcdt-item .date {
+        /deep/ .jcdt-item-main {
+            display: flex;
+            align-items: center;
+        }
+
+        /deep/ .jcdt-item:hover{
+            background: #ffffff;
+            transform: translateY(-4px);
+            box-shadow: 0 10px 24px rgba(0, 0, 0, 0.14);
+        }
+
+        /deep/ .jcdt-item .date {
             font-size: 20px;
-            /*font-weight: bold;*/
+            font-weight: bold;
             white-space: nowrap;
             text-align: left;
             margin-bottom: 8px;
             transition: opacity 0.3s ease;
         }
 
-        .jcdt-item .title {
+        /deep/ .jcdt-item .date i {
+            color: #c11623;
+            font-size: 18px;
+            margin-right: 4px;
+        }
+
+        /deep/ .jcdt-item .title {
             font-size: 16px;
             font-weight: 600;
-            /*margin-bottom: 12px;*/
             line-height: 1.4;
             display: -webkit-box;
             -webkit-line-clamp: 2;
             -webkit-box-orient: vertical;
             overflow: hidden;
-            /*height: 45px;*/
         }
 
-        .jcdt-item .image {
+        /deep/ .jcdt-item .image {
             width: 100%;
             height: 180px;
             margin: 0 0 16px 0;
@@ -155,14 +192,14 @@ const jcdt = {
             transition: transform 0.3s ease;
         }
 
-        .jcdt-item .image img {
+        /deep/ .jcdt-item .image img {
             width: 100%;
             height: 100%;
             object-fit: cover;
             transition: transform 0.3s ease;
         }
 
-        .jcdt-item .summary {
+        /deep/ .jcdt-item .summary {
             font-size: 14px;
             color: #666;
             line-height: 1.6;
@@ -174,5 +211,14 @@ const jcdt = {
             margin-bottom: 12px;
         }
 
+        /deep/ .jcdt-empty {
+            height: 160px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            color: #909399;
+            font-size: 16px;
+        }
+
     `
 };

src/main/resources/views/platform/flow/define/preview.html

@@ -14,7 +14,8 @@
     <!-- 引入 core 包和对应 css-->
     <script src="/assets/platform/plugins/logicflow/logic-flow.js"></script>
     <link rel="stylesheet" href="/assets/platform/plugins/logicflow/index.css"/>
-    <script src="https://cdn.jsdelivr.net/npm/@logicflow/extension@2.1.4/dist/index.min.js"></script>
+    <script src="/assets/platform/plugins/logicflow/index.min.js"></script>
+<!--    <script src="https://cdn.jsdelivr.net/npm/@logicflow/extension@2.1.4/dist/index.min.js"></script>-->
     <script src="/assets/platform/plugins/snaker/SnakerflowDesigner.umd.js"></script>
     <style>
         #snaker-flow-preview {

src/main/resources/views/platform/sys/data/user/pull.html

@@ -80,13 +80,13 @@ layout("/layouts/platform.html"){
             <el-table-column prop="postDoctoralJoinDate" label="进站时间" sortable width="120"></el-table-column>
             <el-table-column prop="personType" label="教职工类别" sortable width="120"></el-table-column>
             <el-table-column prop="comeSchoolDate" label="来校年月" sortable width="120"></el-table-column>
-            <el-table-column prop="technicalTitle" label="技术职称" sortable width="120"></el-table-column>
-            <el-table-column prop="position" label="干部职务" sortable width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="education" label="学历" show-overflow-tooltip sortable width="120"></el-table-column>
-            <el-table-column prop="academicDegree" label="学位" show-overflow-tooltip sortable width="120"></el-table-column>
+<!--            <el-table-column prop="technicalTitle" label="技术职称" sortable width="120"></el-table-column>-->
+<!--            <el-table-column prop="position" label="干部职务" sortable width="120" show-overflow-tooltip></el-table-column>-->
+<!--            <el-table-column prop="education" label="学历" show-overflow-tooltip sortable width="120"></el-table-column>-->
+<!--            <el-table-column prop="academicDegree" label="学位" show-overflow-tooltip sortable width="120"></el-table-column>-->
             <el-table-column prop="unitName" label="单位" show-overflow-tooltip sortable width="120"></el-table-column>
             <el-table-column prop="unitId" label="单位编码" sortable width="120"></el-table-column>
-            <el-table-column prop="nationality" label="国籍" sortable></el-table-column>
+<!--            <el-table-column prop="nationality" label="国籍" sortable></el-table-column>-->
             <el-table-column prop="nation" label="民族" sortable></el-table-column>
         </el-table>
         <!--#include("/layouts/pagination.html"){}#-->

src/main/resources/views/platform/sys/data/user/update.html

@@ -75,13 +75,13 @@ layout("/layouts/platform.html"){
 					<el-table-column prop="preparedBy" label="编制类别" sortable width="120"></el-table-column>
 					<el-table-column prop="personType" label="教职工类别" sortable width="120"></el-table-column>
 					<el-table-column prop="arrivalAtSchoolDate" label="来校年月" sortable width="120"></el-table-column>
-					<el-table-column prop="technicalTitle" label="技术职称" sortable width="120"></el-table-column>
-					<el-table-column prop="position" label="职务" sortable width="120" show-overflow-tooltip></el-table-column>
-					<el-table-column prop="education" label="学历" show-overflow-tooltip sortable width="120"></el-table-column>
-					<el-table-column prop="academicDegree" label="学位" show-overflow-tooltip sortable width="120"></el-table-column>
+<!--					<el-table-column prop="technicalTitle" label="技术职称" sortable width="120"></el-table-column>-->
+<!--					<el-table-column prop="position" label="职务" sortable width="120" show-overflow-tooltip></el-table-column>-->
+<!--					<el-table-column prop="education" label="学历" show-overflow-tooltip sortable width="120"></el-table-column>-->
+<!--					<el-table-column prop="academicDegree" label="学位" show-overflow-tooltip sortable width="120"></el-table-column>-->
 					<el-table-column prop="unitName" label="单位" show-overflow-tooltip sortable width="120"></el-table-column>
 					<el-table-column prop="unitId" label="单位编码" sortable width="120"></el-table-column>
-					<el-table-column prop="nationality" label="国籍" sortable></el-table-column>
+<!--					<el-table-column prop="nationality" label="国籍" sortable></el-table-column>-->
 					<el-table-column prop="nation" label="民族" sortable></el-table-column>
 				</el-table>
 				<!--#include("/layouts/pagination.html"){}#-->

src/main/resources/views/platform/sys/menu/index.html

@@ -140,7 +140,7 @@ layout("/layouts/platform.html"){
     <sort ref="sortRef" @refresh="doSearch"></sort>
     <recommend-setting ref="recommendSettingRef" @refresh="doSearch"></recommend-setting>
 </div>
-<script>
+<script nonce="${cspNonce!}">
     <!--#include("permissionForm.js"){}#-->
     <!--#include("basicForm.js"){}#-->
     <!--#include("sort.js"){}#-->

src/main/resources/views/platform/sys/menu/sort.js

@@ -20,11 +20,13 @@ const SYS_MENU_SORT_COMPONENT = {
             defaultProps: {
                 children: "children",
                 label: "label"
-            }
+            },
+            platform: 'PC'
         }
     },
     methods: {
         onOpen(platform) {
+            this.platform = platform
             this.sortDialogVisible = true
             this.$axios.post("/platform/sys/menu/menuAll", { platform }).then((res) => {
                 if (res.code === 0) {
@@ -48,7 +50,7 @@ const SYS_MENU_SORT_COMPONENT = {
             })
             this.getTreeIds(ids, this.sortMenuData)
             this.$axios
-                .post("/platform/sys/menu/sortDo", { ids: ids.toString() })
+                .post("/platform/sys/menu/sortDo", { ids: ids.toString(), platform: this.platform })
                 .then((res) => {
                     if (res.code === 0) {
                         this.$message.success(res.msg)

src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html

@@ -148,6 +148,15 @@ layout("/layouts/platform.html"){
                         <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
                                   size="small"></enum-tag>
                     </template>
+                    <template v-else-if="column.prop === 'researchFindings'" scope="{row}">
+                        <span v-html="row.researchFindings"></span>
+                    </template>
+                    <template v-else-if="column.prop === 'brief'" scope="{row}">
+                        <span v-html="row.brief"></span>
+                    </template>
+                    <template v-else-if="column.prop === 'measures'" scope="{row}">
+                        <span v-html="row.measures"></span>
+                    </template>
                 </el-table-column>
                 <el-table-column label="操作" fixed="right" min-width="200px">
                     <template scope="{row}">
@@ -201,6 +210,7 @@ layout("/layouts/platform.html"){
                     {label: "立案结果", prop: "caseFilingResult"},
                     // {label: "立案类型", prop: "caseFilingType"},
                     {label: "是否并案", prop: "merge"},
+                    {label: "调研情况", prop: "researchFindings", visible: false},
                     {label: "案由", prop: "brief", visible: false},
                     {label: "建议措施", prop: "measures", visible: false},
                     {label: "主办单位", prop: "masterUnitName"},

src/main/resources/views/platform/zhgh/democratic/proposal/transact/seconded/index.html

@@ -139,6 +139,7 @@ layout("/layouts/platform.html"){
                         processTaskId: row.taskId,
                         taskName: row.curTaskName,
                         type: type,
+                        argsUnitId: row.unitId,
                         tf_opinion: "同意该提案"
                     }
                     this.$refs.proposalInfoRef.onOpen(row)

src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html

@@ -90,6 +90,15 @@ layout("/layouts/platform.html"){
                     </el-form-item>
                 </el-descriptions-item>
                 <el-descriptions-item></el-descriptions-item>
+                <el-descriptions-item label="出生医学证明" :span="2">
+                    <el-form-item prop="files">
+                        <file-upload :value.sync="formData.files"
+                                     upload_mode="drag"
+                                     :upload_number="10" upload_result_category="array"
+                                     accept=".pdf,.jpg, .jpeg, .png"
+                                     complete_result></file-upload>
+                    </el-form-item>
+                </el-descriptions-item>
             </el-descriptions>
             <!-- <table-tool label="假期类别"></table-tool>
              <el-descriptions :column="2" border>
@@ -205,6 +214,7 @@ layout("/layouts/platform.html"){
                     isDystocia: [{required: true, message: '请选择是否难产', trigger: 'change'}],
                     isThreeChildren: [{required: true, message: '请选择是否三胎', trigger: 'change'}],
                     isMultipleBirths: [{required: true, message: '请选择是否多胞胎', trigger: 'change'}],
+                    files: [{required: true, message: '请上传出生医学证明', trigger: 'change'}],
                 },
             }
         },

src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/common/info.js

@@ -28,12 +28,15 @@ const maternityLeaveInfo = {
                 </el-descriptions-item>
                 <el-descriptions-item label="是否多胞胎">{{viewData.isMultipleBirths?'是':'否'}}
                 </el-descriptions-item>
+                <el-descriptions-item label="出生医学证明" :span="2">
+                    <file-preview :files="viewData.files" complete_result></file-preview>
+                </el-descriptions-item>
             </el-descriptions>
-            <table-tool label="假期时间"></table-tool>
+            <!--<table-tool label="假期时间"></table-tool>
             <el-descriptions :column="2" border class="flow-task-form">
 
             </el-descriptions>
-
+-->
             <template v-for="task in doneTasks">
                 <div class="mt10">
                     <div class="process-title">{{ task.displayName }}</div>
@@ -95,12 +98,12 @@ const maternityLeaveInfo = {
                             </el-descriptions-item>
                             <el-descriptions-item></el-descriptions-item>
                         </template>
-                        <el-descriptions-item label="签字" :span="3" v-if="!task.ext.isFirstTaskNode">
+                       <!-- <el-descriptions-item label="签字" :span="3" v-if="!task.ext.isFirstTaskNode">
                             <el-image :src="task.ext.tf_userSign"
                                       v-if="task.ext.tf_userSign"
                                       class="signature-image"></el-image>
                             <span v-else>暂无</span>
-                        </el-descriptions-item>
+                        </el-descriptions-item>-->
                     </el-descriptions>
                 </div>
             </template>

src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/familyPlanningOffice/index.html

@@ -173,12 +173,12 @@ layout("/layouts/platform.html"){
                                     <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
                                 </el-form-item>
                             </el-descriptions-item>
-                            <el-descriptions-item label="电子签名" span="2">
+                            <!--<el-descriptions-item label="电子签名" span="2">
                                 <el-form-item label="电子签名" prop="tf_userSign"
                                               :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
                                     <pc-signature v-model="formData.tf_userSign"></pc-signature>
                                 </el-form-item>
-                            </el-descriptions-item>
+                            </el-descriptions-item>-->
 
 
                         </el-descriptions>

src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html

@@ -89,10 +89,10 @@ layout("/layouts/platform.html"){
                                       :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
                             <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
                         </el-form-item>
-                        <el-form-item label="电子签名" prop="tf_userSign"
+                       <!-- <el-form-item label="电子签名" prop="tf_userSign"
                                       :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
                             <pc-signature v-model="formData.tf_userSign"></pc-signature>
-                        </el-form-item>
+                        </el-form-item>-->
                     </el-form>
                     <el-row type="flex" justify="end">
                         <el-button @click="$refs.guava.index()" size="small">取消</el-button>

src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html

@@ -89,9 +89,9 @@ layout("/layouts/platform.html"){
                                       :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
                             <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
                         </el-form-item>
-                        <el-form-item label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                            <pc-signature v-model="formData.tf_userSign"></pc-signature>
-                        </el-form-item>
+<!--                        <el-form-item label="电子签名" prop="tf_userSign" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
+<!--                            <pc-signature v-model="formData.tf_userSign"></pc-signature>-->
+<!--                        </el-form-item>-->
                     </el-form>
                     <el-row type="flex" justify="end">
                         <el-button @click="$refs.guava.index()" size="small">取消</el-button>

src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html

@@ -143,6 +143,7 @@ layout("/layouts/platform_h5.html"){
                     processTaskId: row.taskId,
                     taskName: row.curTaskName,
                     type: type,
+                    argsUnitId: row.unitId,
                     tf_opinion: "同意该提案"
                 }
             },

src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/apply/index.html

@@ -117,6 +117,22 @@ layout("/layouts/platform_h5.html"){
                         </van-radio-group>
                     </template>
                 </van-field>
+                <van-cell-group title="出生医学证明">
+                    <van-field class="more-text" name="files" :rules="[{ required: true,message:'请上传出生医学证明' }]"
+                               label="" required>
+                        <template #input>
+                            <h5-file-upload
+                                    slot="input"
+                                    :value.sync="formData.files"
+                                    :upload_number="10"
+                                    upload_mode="file"
+                                    upload_result_category="array"
+                                    upload_result_type="url"
+                                    complete_result
+                            ></h5-file-upload>
+                        </template>
+                    </van-field>
+                </van-cell-group>
             </van-cell-group>
 
             <!-- <van-cell-group title="假期类型" class="form-section">

src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/common/info.js

@@ -19,6 +19,9 @@ const MATERNITY_LEAVE_INFO = {
                     <van-cell title="是否难产">{{ viewData.isDystocia ?'是':'否'}}</van-cell>
                     <van-cell title="是否三胎">{{ viewData.isThreeChildren ?'是':'否'}}</van-cell>
                     <van-cell title="是否多胞胎">{{ viewData.isMultipleBirths ?'是':'否'}}</van-cell>
+                    <van-cell title="出生医学证明" class="direction-column-cell">
+                    <file-preview :files="viewData.files" complete_result></file-preview>
+                    </van-cell>
                     </van-cell-group> 
                 <template v-for="(task,index) in doneTasks">
                     <div class="process-title">