代码优化

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

@@ -50,14 +50,8 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.net.URLEncoder;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.SimpleFormatter;
 import java.util.stream.Collectors;
 
 /**

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

@@ -368,13 +368,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Override
     public void checkUserDataScope(Long userId) {
-        if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
-            SysUser user = new SysUser();
-            user.setId(userId);
-            List<SysUser> users = userMapper.selectList(new QueryWrapper<>(user));
-            if (StringUtils.isEmpty(users)) {
-                throw new ServiceException("没有权限访问用户数据！");
-            }
+        Long id = SecurityUtils.getLoginUser().getSysUser().getId();
+        if (SysUser.isAdmin(id)) {
+            return;
+        }
+        if (userId == null) {
+            userId = id;
+        }
+        LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysUser::getId, userId);
+        Long l = userMapper.selectCount(wrapper);
+        if (l == null || l < 1) {
+            throw new ServiceException("没有权限访问用户数据！");
         }
     }
 
@@ -713,7 +718,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return userMapper.select(user);
     }
 
-    public  String calculateWorkExperience(Date workStartDate) {
+    public String calculateWorkExperience(Date workStartDate) {
         LocalDate startDate = workStartDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
         LocalDate currentDate = LocalDate.now();
 
@@ -722,16 +727,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         long months = ChronoUnit.MONTHS.between(anniversary, currentDate);
 
-        if(years == 0){
-            return  months + "个月";
-        }else{
-            if(months == 0){
+        if (years == 0) {
+            return months + "个月";
+        } else {
+            if (months == 0) {
                 return years + "年";
-            }else{
+            } else {
                 return years + "年" + months + "个月";
             }
         }
     }
+
     @Override
     public List<SecurityUserExport> downSecurityUser() {
         SysOrg sysOrg2 = orgService.selectSysOrgById(SecurityUtils.getLoginUser().getOrgId());
@@ -924,7 +930,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }).sheet().doRead();
 
 
-        if (errorList.isEmpty()){
+        if (errorList.isEmpty()) {
             return;
         }
         try {