Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

project_data/sql/0.0.2/soc/soc.sql

@@ -1627,6 +1627,11 @@ INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type
 INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 2, 'GA38-2015', '2', 'org_extend_detached_standard', NULL, 'default', 'N', '0', '超级管理员', '2023-09-14 16:58:37', '超级管理员', '2023-10-07 15:18:27', NULL);
 INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 3, '未达标', '3', 'org_extend_detached_standard', NULL, 'default', 'N', '0', '超级管理员', '2023-09-14 16:58:41', '超级管理员', '2023-10-07 15:18:35', NULL);
 
+-- 添加安全检查无周期
+
+delete from `sys_dict_data` where dict_label ='无周期' and dict_type='check_cycle';
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 6, '无周期', '6', 'check_cycle', NULL, 'default', 'N', '0', '省联社账号', '2023-10-10 10:43:41', '', NULL, NULL);
+
 -- 新增安全指数字典表
 INSERT INTO core_safety_dict (code, parent_code, name) VALUES ('1001', '-1', '安全固化值');
 INSERT INTO core_safety_dict (code, parent_code, name) VALUES ('100101', '1001', '位置信息');

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysUser.java

@@ -256,6 +256,8 @@ public class SysUser extends BaseEntity {
     @TableField(exist = false)
     private Boolean onlyManager;
     @TableField(exist = false)
+    private Boolean template;
+    @TableField(exist = false)
     private Integer orgType;
 
     public boolean isAdmin() {

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -481,22 +481,29 @@ public class SysUserController extends BaseController {
     @RequiresPermissions("system:user:export")
     @PostMapping("/export")
     public void export(SysUser user, HttpServletResponse response) {
-        List<UserExport> list = userService.down(user);
-        if (ObjectUtil.isEmpty(list)) {
-            throw new RuntimeException("导出数据为空!");
-        }
-        AtomicInteger xh= new AtomicInteger();
-        xh.getAndIncrement();
-        list.forEach(e->{
-            if (e.getIsManager()==null) {
-                e.setIsManager("N");
+        List<UserExport> list=null;
+        //如果导出模板
+        if(user.getTemplate()){
+            list = new ArrayList<>();
+        }else{
+            list= userService.down(user);
+            if (ObjectUtil.isEmpty(list)) {
+                throw new RuntimeException("导出数据为空!");
             }
-            e.setXh(String.valueOf(xh.getAndIncrement()));
-        });
+            AtomicInteger xh= new AtomicInteger();
+            xh.getAndIncrement();
+            list.forEach(e->{
+                if (e.getIsManager()==null) {
+                    e.setIsManager("N");
+                }
+                e.setXh(String.valueOf(xh.getAndIncrement()));
+            });
 
-        if(list.size()>10000){
-            throw new RuntimeException("导出数据量过大（单次导出限量10000条数据），请填写条件分批导出");
+            if(list.size()>10000){
+                throw new RuntimeException("导出数据量过大（单次导出限量10000条数据），请填写条件分批导出");
+            }
         }
+
         try {
             // 设置响应头
             response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("用户数据", "utf-8"));