已审批合同查看中因审批人丢失导致数据加载异常问题修复

src/main/java/com/chinaitop/depot/act/service/ActTaskService.java

@@ -323,13 +323,17 @@ public class ActTaskService {
 				HistoryList historyList=new HistoryList();
 				historyList.setAssigneeName(actList.get(j).getHistIns().getAssignee());//审批人名字
 				
-				UserInfo userInfo = userInfoService.findById( Integer.valueOf(actList.get(j).getHistIns().getAssignee()));
-				Integer orgId = userInfo.getOrgId();
-				
-				OrgInfo orgInfo=orgInfoService.findById(orgId);
-				String departmentName=orgInfo.getOrgName();
-				historyList.setDepartment(departmentName);
-				
+				Integer userid = Integer.valueOf(actList.get(j).getHistIns().getAssignee());
+				if (null != userid) {
+					UserInfo userInfo = userInfoService.findById(userid);
+					if (null != userInfo) {
+						Integer orgId = userInfo.getOrgId();
+						OrgInfo orgInfo=orgInfoService.findById(orgId);
+						String departmentName=orgInfo.getOrgName();
+						historyList.setDepartment(departmentName);
+					}
+				}
+
 				historyList.setComment(actList.get(j).getComment());//审批意见
 				historyList.setStartTime(actList.get(j).getHistIns().getStartTime());//开始时间
 				historyList.setEndDate(actList.get(j).getHistIns().getEndTime());//结束时间

src/main/java/com/chinaitop/depot/business/service/impl/ReceiveNoticeServiceImpl.java

@@ -1,5 +1,18 @@
 package com.chinaitop.depot.business.service.impl;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.business.mapper.BusinessNoticeReceiveMapper;
 import com.chinaitop.depot.business.model.BusinessNoticeReceive;
@@ -9,19 +22,6 @@ import com.chinaitop.depot.business.service.FeignAgileService;
 import com.chinaitop.depot.business.service.FeignBasicService;
 import com.chinaitop.depot.business.service.ReceiveNoticeService;
 import com.github.pagehelper.PageHelper;
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 @Service
 public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
@@ -191,6 +191,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                             Integer grainDetailKind = (Integer) map.get("mxpz"); //明细品种
                             Integer grainGrade = (Integer) map.get("dj"); //等级
                             String inputTime = map.get("rq")+""; //入库时间
+                            Integer scnf = Integer.parseInt(map.get("scnf")+"");
                             Date date = null;
                             if(inputTime!=null){
                                 //String year=String.format("%tY", inputTime);
@@ -198,16 +199,18 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                                 date = sdf.parse(inputTime);
                                 // 获取String字符串中的年
-                                SimpleDateFormat y = new SimpleDateFormat("yyyy");
-                                System.out.println(y.format(date));
-                                String enumName = y.format(date);
-
-                                Integer parentId = 1004;
-                                Map<String, Object> basicMap = feignBasicService.getIdByNameAndParentId(parentId, enumName, null);//1004是生产年份的父ID
-                                Integer productiveYear = (Integer) basicMap.get("enumId");
-                                businessNoticeReceive.setProductiveYear(productiveYear);//生产年份
-                                businessNoticeReceive.setGrainAnnual(productiveYear);//收获年度
+                                //SimpleDateFormat y = new SimpleDateFormat("yyyy");
+                                //System.out.println(y.format(date));
+                                //String enumName = y.format(date);
+
+                                //Integer parentId = 1004;
+                                //Map<String, Object> basicMap = feignBasicService.getIdByNameAndParentId(parentId, enumName, null);//1004是生产年份的父ID
+                                //Integer productiveYear = (Integer) basicMap.get("enumId");
+
+                                businessNoticeReceive.setInputTime(date);//入库时间
                             }
+                            businessNoticeReceive.setProductiveYear(scnf);//生产年份
+                            businessNoticeReceive.setGrainAnnual(scnf);//收获年度
 
                             Integer grainProducingArea = (Integer) map.get("gb"); //产地
 
@@ -215,15 +218,14 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                             businessNoticeReceive.setGrainDetailKind(grainDetailKind); //明细品种
                             businessNoticeReceive.setGrainGrade(grainGrade); //等级
                             businessNoticeReceive.setGrainAttribute(grainAttribute); //粮油性质
-                            businessNoticeReceive.setInputTime(date);//入库时间
                             businessNoticeReceive.setGrainProducingArea(grainProducingArea);//产地
 
                         }
                         String  lsyqsl = jsonObject.getString("lsyqsl");
-                        BigDecimal s = new BigDecimal(1000);
-                        BigDecimal sumjhsl = new BigDecimal(lsyqsl);
-                        BigDecimal sumCkslss = sumjhsl.multiply(s);
-                        String count = sumCkslss.toString(); //吨转化为公斤
+//                        BigDecimal s = new BigDecimal(1000);
+//                        BigDecimal sumjhsl = new BigDecimal(lsyqsl);
+//                        BigDecimal sumCkslss = sumjhsl.multiply(s);
+                        //String count = sumCkslss.toString(); //吨转化为公斤
 
                         businessNoticeReceive.setCount(lsyqsl); //计划数量（吨）
                         businessNoticeReceive.setOutgoingPeriod(jsonObject.getString("ckqx")); //出库期限(日期格式)

src/main/java/com/chinaitop/depot/business/service/impl/UserInfoServiceImpl.java

@@ -59,14 +59,16 @@ public class UserInfoServiceImpl implements UserInfoService {
 	public UserInfo findById(Integer userId) {
 		// TODO Auto-generated method stub
 		UserInfo userInfo =  UserInfoMapper.selectByPrimaryKey(userId);
-		UserRoleExample example = new UserRoleExample();
-		example.createCriteria().andUserIdEqualTo(userInfo.getUserId());
-		List<UserRole> urList = userRoleMapper.selectByExample(example);
-		List<String> roleIds = new ArrayList<>();
-		for (UserRole userRole : urList) {
-			roleIds.add(String.valueOf(userRole.getRoleId()));
+		if (null != userInfo) {
+			UserRoleExample example = new UserRoleExample();
+			example.createCriteria().andUserIdEqualTo(userInfo.getUserId());
+			List<UserRole> urList = userRoleMapper.selectByExample(example);
+			List<String> roleIds = new ArrayList<>();
+			for (UserRole userRole : urList) {
+				roleIds.add(String.valueOf(userRole.getRoleId()));
+			}
+			userInfo.setRoleIds(roleIds);
 		}
-		userInfo.setRoleIds(roleIds);
 		return userInfo;
 	}