commit

src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java

@@ -166,6 +166,44 @@ public class FlowTodoCenterController {
         return Result.success(pagination);
     }
 
+    @At
+    @SaCheckLogin
+    public Result completed(Integer pageNumber, Integer pageSize, String searchKeyword, String category) {
+        Sql sql = Sqls.create("""
+                SELECT
+                  ins.id AS instanceId,
+                  ins.processDefineId,
+                  ins.state,
+                  ins.businessNo,
+                  ins.operator,
+                  ins.variable,
+                  ins.createdAt,
+                  ins.variable ->> '$.instanceName' AS instanceName,
+                   cat.`name` categoryName
+                FROM
+                  wf_process_instance ins
+                  LEFT JOIN wf_process_define def ON def.id = ins.processDefineId
+                  LEFT JOIN wf_process_category cat ON cat.id = def.category
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("ins.state", "=", 20);
+        cnd.and("ins.operator", "=", SecurityUtil.getUserId());
+        if (StrUtil.isNotBlank(searchKeyword)) {
+            cnd.where().andLike("ins.variable ->> '$.instanceName'", searchKeyword);
+        }
+        cnd.groupBy("ins.id");
+        cnd.desc("ins.createdAt");
+        sql.setCondition(cnd);
+        Pagination pagination = sysUserService.listPageMap(pageNumber, pageSize, sql);
+        List<NutMap> list = pagination.getList();
+        for (NutMap row : list) {
+            NutMap variable = Json.fromJson(NutMap.class, row.getString("variable"));
+            row.put("variable", variable);
+        }
+        return Result.success(pagination);
+    }
+
     @At
     @SaCheckLogin
     public Result statistics() {

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

@@ -264,13 +264,13 @@ public class SysHomeController {
 //    @CacheResult(cacheKey = "news", ignoreNull = true, cacheLiveTime = 60 * 60 * 24)
     public Result getNews() {
         // 定义要爬取的URL
-        String domain = "https://cdgh.ncu.edu.cn/";
+        String domain = "https://gh.hgu.edu.cn/index.htm";
         try {
             // 使用Jsoup连接到URL并获取页面内容
             Document doc = Jsoup.connect(domain).get();
 
             JSONObject root = new JSONObject();
-
+/*
             // 1. 新闻快讯（来自 .list1）
             List<JSONObject> newsArray = new ArrayList<>();
             Elements newsItems = doc.select(".group1 .list1 li");
@@ -328,7 +328,7 @@ public class SysHomeController {
                 node.set("image", domain + imageUrl);
                 grassrootsArray.add(node);
             }
-            root.set("grassroots", grassrootsArray);
+            root.set("grassroots", grassrootsArray);*/
             return Result.success(root);
         } catch (Exception e) {
             log.error(e);

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

@@ -504,4 +504,25 @@ public class SysRoleController {
         return Result.success(Daos.ext(sysRoleService.dao(), fieldFilter).query(Sys_menu.class, cnd));
     }
 
+    @At
+    @Ok("json:full")
+    @SaCheckLogin
+    public Result getRoleNames(){
+        Sql sql = Sqls.create("""
+                SELECT
+                  GROUP_CONCAT(DISTINCT sr.`name`) roleNames
+                FROM
+                  `sys_user_role` sur
+                  LEFT JOIN sys_role sr ON sr.id = sur.roleId
+                WHERE
+                  sur.userId = @userId
+                ORDER BY
+                  sr.sort DESC
+                """).setParam("userId", SecurityUtil.getUserId());
+        sql.setCallback(Sqls.callback.map());
+        sysRoleService.dao().execute(sql);
+        return Result.success(sql.getResult());
+
+    }
+
 }

src/main/java/com/budwk/app/sys/controller/v4/SysV4AppsController.java

@@ -52,7 +52,7 @@ public class SysV4AppsController {
             Map<String, Object> category = new HashMap<>();
             category.put("id", module.getId());
             category.put("name", module.getName());
-            category.put("icon", module.getFaIcon());
+            category.put("icon", module.getIcon());
             return category;
         }).toList();
         return Result.success("获取应用分类成功").addData(categories);
@@ -67,10 +67,11 @@ public class SysV4AppsController {
         Sql sql = Sqls.create("""
                 SELECT
                   m.id,
-                  m.name,
+                  m.`name`,
                   m.href,
                   m.icon,
                   m.picIcon,
+                  sm.`name` AS moduleName,
                 CASE
                     WHEN f.userId IS NOT NULL THEN
                     1 ELSE 0
@@ -79,6 +80,7 @@ public class SysV4AppsController {
                   sys_menu m
                   LEFT JOIN sys_user_favorite_app f ON m.id = f.appId
                   AND f.userId = @userId
+                  LEFT JOIN sys_module sm ON sm.id = m.moduleId
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();
@@ -138,10 +140,11 @@ public class SysV4AppsController {
         Sql sql = Sqls.create("""
                 SELECT
                   m.id,
-                  m.name,
+                  m.`name`,
                   m.href,
                   m.icon,
                   m.picIcon,
+                  sm.`name` AS moduleName,
                   1 AS isFavorite
                 FROM
                   sys_user_favorite_app f
@@ -149,6 +152,7 @@ public class SysV4AppsController {
                   sys_menu m
                 ON
                   f.appId = m.id
+                LEFT JOIN sys_module sm ON sm.id = m.moduleId
                 WHERE
                   f.userId = @userId
                   AND m.platform = 'PC'

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

@@ -468,9 +468,9 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
 
         // 生成变更信息描述
         String changeInfos = changeList.stream()
-                .map(v -> v.getString("fieldName") + "：" +
-                        HtmlUtil.cleanHtmlTag(v.getString("sourceValue")) + "→" +
-                        HtmlUtil.cleanHtmlTag(v.getString("newValue")))
+                .map(v -> v.getString("fieldName", "") + "：" +
+                        HtmlUtil.cleanHtmlTag(v.getString("sourceValue", "")) + "→" +
+                        HtmlUtil.cleanHtmlTag(v.getString("newValue", "")))
                 .collect(Collectors.joining("；"));
 
         // 设置历史记录信息

src/main/java/com/budwk/app/zhgh/staffmanage/member/service/impl/MemberManageServiceImpl.java

@@ -397,7 +397,7 @@ public class MemberManageServiceImpl extends BaseServiceImpl<Sys_user> implement
             // 如果有工会关系变更，也需要记录变更了什么工会
             history.setChangeInfos(changeList);
             String changeInfos = changeList.stream().map(v -> {
-                return v.getString("fieldName") + "：" + HtmlUtil.cleanHtmlTag(v.getString("sourceValue")) + "->" + HtmlUtil.cleanHtmlTag(v.getString("newValue"));
+                return v.getString("fieldName") + "：" + HtmlUtil.cleanHtmlTag(v.getString("sourceValue", "")) + "->" + HtmlUtil.cleanHtmlTag(v.getString("newValue", ""));
             }).collect(Collectors.joining("；"));
             history.setChangeInfosStr(changeInfos);
             dao().updateIgnoreNull(info);