commit

src/main/java/io/v/nutz/web/commons/proc/XssSqlFilterProcessor.java

@@ -72,11 +72,11 @@ public class XssSqlFilterProcessor extends AbstractProcessor {
 
         //use remove -|,
         String regEx_sql = """
-                and|exec|execute|insert|select|delete|update|count|drop|*|%|chr|mid|master|truncate|
-                                char|declare|sitename|net user|xp_cmdshell|;|or|+|like'|and|exec|execute|insert|create|drop|
+                and|exec|execute|insert|select|delete|update|count|drop|chr|mid|master|truncate|
+                                char|declare|sitename|net user|xp_cmdshell|or|like'|and|exec|execute|insert|create|drop|
                                 table|from|grant|group_concat|column_name|
-                                information_schema.columns|table_schema|union|where|select|delete|update|order|by|count|*|
-                                chr|mid|master|truncate|char|declare|or|;|--|+|like|//|/|%|#
+                                information_schema.columns|table_schema|union|where|select|delete|update|order|by|count|
+                                chr|mid|master|truncate|char|declare|or|like
                 """;
         String regEx_xss = "script|iframe|img";
         //SQL过滤

src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java

@@ -137,10 +137,8 @@ public class ActivityUnionManageController {
             cnd.and(group);
         }
 
-        cnd.limit(1, 30);
-
         sql.setCondition(cnd);
-        return sysUserService.listMap(sql);
+        return sysUserService.listPageMap(1, 30, sql);
     }
 
     /**

src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityTissueServiceImpl.java

@@ -66,7 +66,7 @@ public class ActivityTissueServiceImpl extends ViServiceImpl<ActivityTissue> imp
                 	$condition
                 """);
 
-        cnd.andEx("YEAR(tissue.startTime)", "=", year);
+        cnd.andEx("YEAR(tissue.applyTime)", "=", year);
         cnd.andEx("tissue.projectTypeCode", "!=", "50004");
         cnd.andEx("tissue.unionId", "=", unionId);
         cnd.andEx("tissue.type", "=", type);

src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java

@@ -148,9 +148,8 @@ public class WelfareListController {
         cnd.andEX("wcn.courierNumber", "=", courierNumber);
 
         cnd.groupBy("wl.id");
-        cnd.asc("wl.unitid");
-        cnd.asc("wl.userSortNum");
-        cnd.desc("wl.id");
+        cnd.asc("wl.unitCode");
+        cnd.asc("wl.loginname");
 
         if (!ShiroUtil.hasAnyRoles("sysadmin")) {
             cnd.and("wl.unionid", "=", Vi.getUnionId());

src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareMemberAdjustmentController.java

@@ -160,7 +160,6 @@ public class WelfareMemberAdjustmentController {
         cnd.and(pageForm);
         cnd.desc("his.changeTime");
         cnd.asc("u.unitid");
-        cnd.asc("COALESCE(u.userSortNum, 999999)");
         cnd.desc("u.id");
 
         pageParam.participate(cnd, "u");

src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareMemberMangeController.java

@@ -96,7 +96,6 @@ public class WelfareMemberMangeController {
         pageParam.participate(cnd);
         cnd.and(pageForm);
         cnd.asc("unitid");
-        cnd.asc("COALESCE(userSortNum, 999999)");
         cnd.desc("id");
         sql.setCondition(cnd);
         return welfareMemberService.list(pageForm, sql);

src/main/java/io/v/nutz/zhgh/welfare/controller/check/WelfareMemberCheckUnionController.java

@@ -167,7 +167,6 @@ public class WelfareMemberCheckUnionController {
         cnd.and(pageForm);
         cnd.desc("his.changeTime");
         cnd.asc("u.unitid");
-        cnd.asc("COALESCE(u.userSortNum, 999999)");
         cnd.desc("u.id");
 
         if (Lang.isNotEmpty(changeTypes)) {

src/main/java/io/v/nutz/zhgh/zc/controller/zczjlbController.java

@@ -91,7 +91,7 @@ public class zczjlbController {
         Double surplusMoney = zcxxes.stream().filter(z -> !List.of("报废", "丢失").contains(z.getZczt())).mapToDouble(Zgfw_Zcxx::getSurplusMoney).sum();
         //累计折旧
         Double depreciationMoney = allMoney - surplusMoney;
-        return Map.of("allMoney", allMoney, "surplusMoney", surplusMoney, "depreciationMoney", depreciationMoney);
+        return Map.of("allMoney", allMoney, "surplusMoney", surplusMoney, "depreciationMoney", String.format("%.2f", depreciationMoney));
     }
 
 

src/main/java/io/v/nutz/zhgh/zc/model/ZgfwZcxxTemp.java

@@ -19,6 +19,8 @@ public class ZgfwZcxxTemp {
     private String zcgbflh;
 
     @Excel(name = "资产名称", width = 20)
+
+
     private String zcmc;
 
     @Excel(name = "型号规格", width = 20)