xiugbug

project_data/sql/0.0.3/soc/soc.sql

@@ -233,6 +233,16 @@ INSERT ignore INTO core_safety_index_calculate_rule_item (id, rule_id, indicator
 -- INSERT ignore INTO core_safety_index_calculate_rule_item (id, rule_id, indicator_note, calculate_type, indicator_days, item_type, item_value, order_num, create_time, create_by, update_time, update_by) VALUES (1717123345565184002, 1714172822255894529, '连续五次未登', 2, 5, null, 1, 0, now(), null, now(), null);
 -- INSERT ignore INTO core_safety_index_calculate_rule_item (id, rule_id, indicator_note, calculate_type, indicator_days, item_type, item_value, order_num, create_time, create_by, update_time, update_by) VALUES (1717123345569378306, 1714172822255894529, '连续十次未登', 2, 10, null, 1, 0, now(), null, now(), null);
 
+delete from sys_menu where id in (1728960667819544578);
+INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark)
+VALUES (1728960667819544578, '安保部门从业人员导出', 100, 10, '', null, null, 1, 0, 'F', '0', '0', 'system:user:exportSecurity', '1', null, null, null, now(), '', null, '');
+delete from sys_role_menu where menu_id=1728960667819544578;
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 1728960667819544578);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (116, 1728960667819544578);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (117, 1728960667819544578);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (118, 1728960667819544578);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (119, 1728960667819544578);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 1728960667819544578);
 -- 新增安保综合评价规则目录、菜单、页面及页面权限
 delete from sys_menu where id in (1714247486990786561,1712277074707779586,1712278645189414914,1714187591810588674,1714187748136493058,1714187851295399937,1714188002965626881,1714188131026116609);
 INSERT INTO sys_menu (id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, perms, platform_type, icon, image_path, create_by, create_time, update_by, update_time, remark) VALUES (1712277074707779586, '安全综合管理评价', 0, 13, '/safetyindex', null, null, 1, 0, 'M', '0', '0', '', '1', 'clipboard', null, null, now(), null, now(), '');
@@ -1555,4 +1565,5 @@ FROM
 	order by a.role_id	;
 -- 字段长度变更
 ALTER TABLE `core_drill_task`
-    MODIFY COLUMN `drill_site` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '演练地点' AFTER `drill_end_time`;
+    MODIFY COLUMN `drill_site` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '演练地点' AFTER `drill_end_time`;
+

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysUserMapper.java

@@ -159,7 +159,8 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     List<SysUser> selectUserListByRoleAndOrg(@Param("sysRoleOrgDTO") SysPlanOrgDTO sysRoleOrgDTO);
 
     List<UserExport> select(@Param("info") SysUser user);
-    List<SecurityUserExport>selectSecurityUser();
 
-    List<String> selectCountByNames(@Param("names")List<String> names);
+    List<SecurityUserExport> selectSecurityUser(@Param("path") String path);
+
+    List<String> selectCountByNames(@Param("names") List<String> names);
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysUserServiceImpl.java

@@ -56,30 +56,22 @@ import java.util.stream.Collectors;
 @Service
 public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
     private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
-
+    @Autowired
+    protected Validator validator;
     @Autowired
     private SysUserMapper userMapper;
-
     @Autowired
     private SysRoleMapper roleMapper;
-
     @Autowired
     private SysPostMapper postMapper;
-
     @Autowired
     private SysUserRoleMapper userRoleMapper;
-
     @Autowired
     private SysUserPostMapper userPostMapper;
-
     @Autowired
     private ISysConfigService configService;
-
     @Autowired
     private ISysOrgService orgService;
-
-    @Autowired
-    protected Validator validator;
     @Autowired
     private SysOrgMapper sysOrgMapper;
     @Autowired
@@ -699,7 +691,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Override
     public List<SecurityUserExport> downSecurityUser() {
-        List<SecurityUserExport> securityUserExports = userMapper.selectSecurityUser();
+        SysOrg sysOrg2 = orgService.selectSysOrgById(SecurityUtils.getLoginUser().getOrgId());
+        List<SecurityUserExport> securityUserExports = userMapper.selectSecurityUser(sysOrg2.getPath());
         securityUserExports.forEach(s -> {
             s.setCity("福建");
             SysOrg sysOrg = sysOrgMapper.selectById(s.getOrgId());
@@ -732,7 +725,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             //取得方式
             String sysEducationType = iSysDictDataService.selectDictLabel("sys_education_type", s.getEducationType());
             s.setEducationType(sysEducationType);
-            String sysDuties = iSysDictDataService.selectDictLabel("sys_duties", s.getResponsibilitiesLeaderDuties());s.setResponsibilitiesLeaderDuties(sysDuties);
+            String sysDuties = iSysDictDataService.selectDictLabel("sys_duties", s.getResponsibilitiesLeaderDuties());
+            s.setResponsibilitiesLeaderDuties(sysDuties);
         });
         return securityUserExports;
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/SecurityUserExport.java

@@ -50,7 +50,7 @@ public class SecurityUserExport {
     private Date entryTime;
     @ExcelProperty(value = "工作年限", index = 12)
     private String workDuration;
-    @ExcelProperty(value = "最高学历", index = 13)
+    @ExcelProperty(value="最高学历", index = 13)
     private String highestEducation;
     @ExcelProperty(value = "取得方式", index = 14)
     private String educationType;

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysNfcBindMapper.xml

@@ -123,7 +123,10 @@
         order by a.org_id,a.area_id,code
     </select>
     <select id="selectSysNfcBindByCode" resultType="com.xunmei.system.domain.SysNfcBind">
-        SELECT * FROM sys_nfc_bind WHERE del_flag=0 AND code=#{code}
+        SELECT *
+        FROM sys_nfc_bind
+        WHERE del_flag = 0
+          AND code = #{code}
     </select>
 
     <insert id="insertSysNfcBind" parameterType="com.xunmei.system.domain.SysNfcBind">
@@ -256,8 +259,8 @@
         </foreach>
     </delete>
     <delete id="deleteSysNfcBindByCode">
-        delete
-        from sys_nfc_bind
-        where  code = #{code}
+        UPDATE sys_nfc_bind
+        set del_flag=2
+        where code = #{code}
     </delete>
 </mapper>

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -220,24 +220,21 @@
         select id, username
         from sys_user
         where username = #{userName}
-          and deleted = '0'
-        limit 1
+          and deleted = '0' limit 1
     </select>
 
     <select id="checkPhoneUnique" parameterType="String" resultType="com.xunmei.system.api.domain.SysUser">
         select id, phone
         from sys_user
         where phone = #{phonenumber}
-          and deleted = '0'
-        limit 1
+          and deleted = '0' limit 1
     </select>
 
     <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
         select user_id, email
         from sys_user
         where email = #{email}
-          and deleted = '0'
-        limit 1
+          and deleted = '0' limit 1
     </select>
 
     <insert id="insertUser" parameterType="com.xunmei.system.api.domain.SysUser" useGeneratedKeys="true"
@@ -411,8 +408,8 @@
         (
         SELECT
         h.user_id AS is_manager,
-<!--        ur. role_names,-->
-<!--        ur. roleIds,-->
+        <!--        ur. role_names,-->
+        <!--        ur. roleIds,-->
         GROUP_CONCAT(sr.role_name) role_names,
         CONCAT(",",GROUP_CONCAT( sr.id ),",") as roleIds,
         u.id,
@@ -455,10 +452,10 @@
         sys_user u
         LEFT JOIN sys_org o ON u.original_org_id = o.id
         LEFT JOIN ( SELECT user_id FROM sys_user_role uo LEFT JOIN sys_role ro ON uo.role_id = ro.id WHERE ro.role_name
-<!--        LIKE '%安全保卫管理人员' group by user_id) h ON h.user_id = u.id-->
-<!--        LEFT JOIN (select sro.user_id, GROUP_CONCAT(sr.role_name) role_names,-->
-<!--        CONCAT(",",GROUP_CONCAT( sr.id ),",") as roleIds from sys_user_role sro-->
-<!--        LEFT JOIN sys_role sr on sro.role_id=sr.id) ur on ur.user_id = u.id-->
+        <!--        LIKE '%安全保卫管理人员' group by user_id) h ON h.user_id = u.id-->
+        <!--        LEFT JOIN (select sro.user_id, GROUP_CONCAT(sr.role_name) role_names,-->
+        <!--        CONCAT(",",GROUP_CONCAT( sr.id ),",") as roleIds from sys_user_role sro-->
+        <!--        LEFT JOIN sys_role sr on sro.role_id=sr.id) ur on ur.user_id = u.id-->
         LIKE '%安全保卫管理人员' ) h ON h.user_id = u.id
         LEFT JOIN sys_user_role sro on u.id=sro.user_id
         LEFT JOIN sys_role sr on sro.role_id=sr.id
@@ -511,7 +508,7 @@
         <!--        <if test="info.onlyManager ==false or info.onlyManager==null">-->
         <!--            AND (t.is_manage is NULL OR t.is_manage ='N')-->
         <!--        </if>-->
-        ORDER BY  t.org_id DESC, t.id DESC
+        ORDER BY t.org_id DESC, t.id DESC
     </select>
     <select id="selectrolesByOrgId" resultType="com.xunmei.system.api.domain.SysRole">
         SELECT r.*
@@ -736,5 +733,7 @@
                  LEFT JOIN sys_user b ON a.user_id = b.id
                  LEFT JOIN sys_org c ON c.id = b.org_id
         WHERE b.deleted = 0
+          and c.path like concat(#{path}, '%')
+
     </select>
 </mapper>