fixbug

person-admin/src/main/java/com/person/modules/person/service/impl/ConvertApplyServiceImpl.java

@@ -13,6 +13,7 @@ import com.person.common.utils.Query;
 import com.person.modules.person.dao.ConvertApplyDao;
 import com.person.modules.person.entity.ConvertApplyEntity;
 import com.person.modules.person.service.ConvertApplyService;
+import com.person.modules.sys.entity.SysUserEntity;
 import com.person.modules.sys.service.SysUserService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,10 +46,16 @@ public class ConvertApplyServiceImpl extends ServiceImpl<ConvertApplyDao, Conver
             Long userId = r.getApplyUserId();
             Long approvalUserId = r.getApprovalUserId();
             if (null != userId) {
-                r.setApplyName(userService.getById(userId).getName());
+                SysUserEntity u = userService.getById(userId);
+                if (u != null) {
+                    r.setApplyName(u.getName());
+                }
             }
             if (null != approvalUserId) {
-                r.setApprovalName(userService.getById(approvalUserId).getName());
+                SysUserEntity u = userService.getById(approvalUserId);
+                if (u != null) {
+                    r.setApprovalName(u.getName());
+                }
             }
             list.add(r);
         }

person-admin/src/main/java/com/person/modules/person/service/impl/InterviewPlanServiceImpl.java

@@ -19,6 +19,7 @@ import com.person.modules.person.entity.InterviewPlanEntity;
 import com.person.modules.person.entity.SalaryRecordEntity;
 import com.person.modules.person.entity.UserDocEntity;
 import com.person.modules.person.service.InterviewPlanService;
+import com.person.modules.sys.entity.SysUserEntity;
 import com.person.modules.sys.service.SysUserService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,7 +51,10 @@ public class InterviewPlanServiceImpl extends ServiceImpl<InterviewPlanDao, Inte
 
         List<InterviewPlanEntity> list = new ArrayList<InterviewPlanEntity>();
         for (InterviewPlanEntity r : records) {
-            r.setMeetName(userService.getById(r.getMeetUserId()).getName());
+            SysUserEntity u = userService.getById(r.getMeetUserId());
+            if(null!=u) {
+                r.setMeetName(u.getName());
+            }
             list.add(r);
         }
         page.setRecords(list);

person-admin/src/main/java/com/person/modules/person/service/impl/SalaryRecordServiceImpl.java

@@ -47,8 +47,12 @@ public class SalaryRecordServiceImpl extends ServiceImpl<SalaryRecordDao, Salary
         for (SalaryRecordEntity r : records) {
             SysUserEntity user = userService.getById(r.getUserId());
             SysDeptEntity dept = deptService.getById(user.getDeptId());
-            r.setDeptName(dept.getName());
-            r.setUserName(user.getName());
+            if (dept != null) {
+                r.setDeptName(dept.getName());
+            }
+            if (user != null) {
+                r.setUserName(user.getName());
+            }
             list.add(r);
         }
         page.setRecords(list);

person-admin/src/main/java/com/person/modules/person/service/impl/UserDocServiceImpl.java

@@ -16,8 +16,10 @@ import com.person.modules.person.entity.SalaryRecordEntity;
 import com.person.modules.person.entity.UserDocEntity;
 import com.person.modules.person.service.UserDocService;
 import com.person.modules.sys.entity.SysDeptEntity;
+import com.person.modules.sys.entity.SysUserEntity;
 import com.person.modules.sys.service.SysDeptService;
 import com.person.modules.sys.service.SysUserService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -59,15 +61,24 @@ public class UserDocServiceImpl extends ServiceImpl<UserDocDao, UserDocEntity> i
         List<UserDocEntity> records = page.getRecords();
 
         List<UserDocEntity> list = new ArrayList<UserDocEntity>();
-        for (UserDocEntity r : records) {
-            String birthYear = r.getBirth().substring(0, 4);
-            String year = DateUtils.format(new Date(), "YYYY");
-            int age = Integer.valueOf(year) - Integer.valueOf(birthYear);
-            r.setAge(age);
-            r.setUserName(userService.getById(r.getUserId()).getName());
-            SysDeptEntity sysDeptEntity = sysDeptService.getById(r.getDeptId());
-            r.setDeptName(sysDeptEntity.getName());
-            list.add(r);
+        if(CollectionUtils.isNotEmpty(records)) {
+            for (UserDocEntity r : records) {
+                if (StringUtils.isNotBlank(r.getBirth())) {
+                    String birthYear = r.getBirth().substring(0, 4);
+                    String year = DateUtils.format(new Date(), "YYYY");
+                    int age = Integer.valueOf(year) - Integer.valueOf(birthYear);
+                    r.setAge(age);
+                }
+                SysUserEntity u = userService.getById(r.getUserId());
+                if (null != u) {
+                    r.setUserName(u.getName());
+                }
+                SysDeptEntity dept = sysDeptService.getById(r.getDeptId());
+                if (dept != null) {
+                    r.setDeptName(dept.getName());
+                }
+                list.add(r);
+            }
         }
         page.setRecords(list);
         return new PageUtils(page);

person-admin/src/main/java/com/person/modules/person/service/impl/UserPlanServiceImpl.java

@@ -14,6 +14,7 @@ import com.person.modules.person.dao.UserPlanDao;
 import com.person.modules.person.entity.UserPlanEntity;
 import com.person.modules.person.entity.WorkDailyEntity;
 import com.person.modules.person.service.UserPlanService;
+import com.person.modules.sys.entity.SysUserEntity;
 import com.person.modules.sys.service.SysUserService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +46,10 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanDao, UserPlanEntity
 
         List<UserPlanEntity> list = new ArrayList<UserPlanEntity>();
         for (UserPlanEntity r : records) {
-            r.setUserName(userService.getById(r.getUserId()).getName());
+            SysUserEntity u = userService.getById(r.getUserId());
+            if (u != null) {
+                r.setUserName(u.getName());
+            }
             list.add(r);
         }
         page.setRecords(list);

person-admin/src/main/java/com/person/modules/person/service/impl/WorkDailyServiceImpl.java

 /**
- * 
  *
- * 
- *
- * 
  */
 
 package com.person.modules.person.service.impl;
@@ -18,6 +14,7 @@ import com.person.modules.person.dao.WorkDailyDao;
 import com.person.modules.person.entity.WorkDailyEntity;
 import com.person.modules.person.entity.WorkRecordEntity;
 import com.person.modules.person.service.WorkDailyService;
+import com.person.modules.sys.entity.SysUserEntity;
 import com.person.modules.sys.service.SysUserService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,25 +30,29 @@ import java.util.Map;
 public class WorkDailyServiceImpl extends ServiceImpl<WorkDailyDao, WorkDailyEntity> implements WorkDailyService {
     @Autowired
     SysUserService userService;
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-        String workDate = (String)params.get("workDate");
-        String workMonth = (String)params.get("workMonth");
+        String workDate = (String) params.get("workDate");
+        String workMonth = (String) params.get("workMonth");
         Long userId = (Long) params.get("userId");
 
         IPage<WorkDailyEntity> page = this.page(
                 new Query<WorkDailyEntity>().getPage(params),
                 new QueryWrapper<WorkDailyEntity>()
-                        .eq(StringUtils.isNotBlank(workDate),"work_date", workDate)
-                        .eq(StringUtils.isNotBlank(workMonth),"work_month", workMonth)
+                        .eq(StringUtils.isNotBlank(workDate), "work_date", workDate)
+                        .eq(StringUtils.isNotBlank(workMonth), "work_month", workMonth)
                         .eq(userId != null, "user_id", userId)
-                        .apply(params.get(Constant.SQL_FILTER) != null, (String)params.get(Constant.SQL_FILTER))
+                        .apply(params.get(Constant.SQL_FILTER) != null, (String) params.get(Constant.SQL_FILTER))
         );
         List<WorkDailyEntity> records = page.getRecords();
 
         List<WorkDailyEntity> list = new ArrayList<WorkDailyEntity>();
         for (WorkDailyEntity r : records) {
-            r.setUserName(userService.getById(r.getUserId()).getName());
+            SysUserEntity u = userService.getById(r.getUserId());
+            if (u != null) {
+                r.setUserName(u.getName());
+            }
             list.add(r);
         }
         page.setRecords(list);

person-admin/src/main/java/com/person/modules/person/service/impl/WorkRecordServiceImpl.java

@@ -15,6 +15,7 @@ import com.person.modules.person.entity.UserDocEntity;
 import com.person.modules.person.entity.UserPlanEntity;
 import com.person.modules.person.entity.WorkRecordEntity;
 import com.person.modules.person.service.WorkRecordService;
+import com.person.modules.sys.entity.SysUserEntity;
 import com.person.modules.sys.service.SysUserService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +31,7 @@ import java.util.Map;
 public class WorkRecordServiceImpl extends ServiceImpl<WorkRecordDao, WorkRecordEntity> implements WorkRecordService {
     @Autowired
     SysUserService userService;
+
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
         String workMonth = (String) params.get("workMonth");
@@ -50,7 +52,10 @@ public class WorkRecordServiceImpl extends ServiceImpl<WorkRecordDao, WorkRecord
 
         List<WorkRecordEntity> list = new ArrayList<WorkRecordEntity>();
         for (WorkRecordEntity r : records) {
-            r.setUserName(userService.getById(r.getUserId()).getName());
+            SysUserEntity u = userService.getById(r.getUserId());
+            if (u != null) {
+                r.setUserName(u.getName());
+            }
             list.add(r);
         }
         page.setRecords(list);