Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.5

# Conflicts:
#	soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/SecurityUserExport.java
#	soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

soc-modules/soc-modules-sync/src/main/java/com/xunmei/sync/service/impl/FJNXSyncServiceImpl.java

@@ -843,16 +843,19 @@ public class FJNXSyncServiceImpl implements IFJNXSyncService {
 
     /**
      * 性别转换 本系统 0：男 ，1：女
-     * @param fjnxSex  1 ：女 ,2 :男
+     * @param fjnxSex  1 ：男,2 :女
      * @return
      */
     private String convertSexValue(String fjnxSex)
     {
         if(ObjectUtil.equal("2",fjnxSex))
         {
+            return "1";
+        }
+        else{
             return "0";
         }
-        return fjnxSex;
+//        return fjnxSex;
     }
 
 

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

@@ -226,7 +226,7 @@ public class SysUserController extends BaseController {
                 informationByUserId = new SysUserInformation();
             }
             SysUser sysUser = userService.selectUserById(userId);
-            sysUser.setOrgId(sysUser.getOriginalOrgId());
+//            sysUser.setOrgId(sysUser.getOriginalOrgId());
             List<SysUserRole> userRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("user_id", userId));
             sysUser.setRoles(roles);
             String sex = "-";
@@ -274,7 +274,7 @@ public class SysUserController extends BaseController {
         final String salt = SecurityUtils.salt();
         user.setSalt(salt);
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword(), salt));
-        user.setOriginalOrgId(user.getOrgId());
+        //user.setOriginalOrgId(user.getOrgId());
         userService.insertUser(user);
         return AjaxResult.success();
     }
@@ -311,7 +311,7 @@ public class SysUserController extends BaseController {
             }
 
         }
-        user.setOriginalOrgId(user.getOrgId());
+//        user.setOriginalOrgId(user.getOrgId());
         user.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(userService.updateUser(user));
     }

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

@@ -88,6 +88,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         if (role.getParams().get("beginTime") != null && role.getParams().get("endTime") != null) {
             query.between("create_time", role.getParams().get("beginTime") + " 00:00:00", role.getParams().get("endTime") + " 23:59:59");
         }
+        query.orderByAsc("role_sort");
         page = roleMapper.selectPage(page, query);
         return TableDataInfo.build(page);
     }
@@ -243,6 +244,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         // 新增角色信息
         role.setDelFlag(0);
         roleMapper.insertRole(role);
+        loadingRoleCache();
         return insertRoleMenu(role);
     }
 
@@ -265,6 +267,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         roleMapper.updateRole(role);
         // 删除角色与菜单关联
         roleMenuMapper.deleteRoleMenuByRoleId(role.getId());
+        loadingRoleCache();
         return insertRoleMenu(role);
     }
 
@@ -292,6 +295,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         roleMapper.updateRole(role);
         // 删除角色与机构关联
         roleDeptMapper.deleteRoleDeptByRoleId(role.getId());
+        loadingRoleCache();
         // 新增角色和机构信息（数据权限）
         return insertRoleDept(role);
     }
@@ -377,7 +381,10 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         roleMenuMapper.deleteRoleMenu(roleIds);
         // 删除角色与机构关联
         roleDeptMapper.deleteRoleDept(roleIds);
-        return roleMapper.deleteRoleByIds(roleIds);
+
+        int count= roleMapper.deleteRoleByIds(roleIds);
+        loadingRoleCache();
+        return count;
     }
 
     /**
@@ -471,8 +478,24 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
             if (sysRole.getRoleName().equals("超级管理员")) {
                 continue;
             }
+            // 删除的角色
+            if(sysRole.getDelFlag()==2)
+            {
+                continue;
+            }
+            // 停用的角色
+//            if(sysRole.getStatus()==1)
+//            {
+//                continue;
+//            }
             list.add(sysRole);
         }
+        list=  list.stream().sorted(new Comparator<SysRole>() {//使用List接口的方法排序
+            @Override
+            public int compare(SysRole o1, SysRole o2) {
+                return o1.getRoleSort().compareTo(o2.getRoleSort());
+            }
+        }).collect(Collectors.toList());
         clearRoleCache();
         RedisUtils.setCacheList(CacheConstants.ROLE_CACHE_LIST_KEY, list);
     }

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

@@ -724,7 +724,7 @@
                a.is_full_time                           AS isFullTime,
                a.work_type                              AS workType,
                a.entry_time                             AS entryTime,
-               TIMESTAMPDIFF(YEAR, a.work_time, NOW()) AS workDuration,
+               ROUND(TIMESTAMPDIFF(MONTH, a.work_time, NOW())/12,2) AS workDuration,
                a.highest_education                      AS highestEducation,
                a.education_type                         AS educationType,
                a.professional_qualifications            AS professionalQualifications,
@@ -736,6 +736,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 b.is_manage='Y'
           and c.path like concat(#{path}, '%')
     </select>