Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -1489,18 +1489,20 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	 * @param projectRecords
 	 */
 	public void getDownloadContractInfos(RuralProjectRecords projectRecords) {
-		WorkContractInfo workContractInfo = contractInfoService.get(projectRecords.getWorkContractInfo().getId());
-		if(workContractInfo!=null){
-			if(workContractInfo.getWorkClientInfoList()!=null&&!workContractInfo.getWorkClientInfoList().isEmpty()){
-				StringBuilder workClinetInfoIds = new StringBuilder();
-				for (WorkClientInfo workClientInfo : workContractInfo.getWorkClientInfoList()) {
-					workClinetInfoIds.append(workClientInfo.getId()).append(",");
+		if(null != projectRecords.getWorkContractInfo() && StringUtils.isNotBlank(projectRecords.getWorkContractInfo().getId())){
+			WorkContractInfo workContractInfo = contractInfoService.get(projectRecords.getWorkContractInfo().getId());
+			if(workContractInfo!=null){
+				if(workContractInfo.getWorkClientInfoList()!=null&&!workContractInfo.getWorkClientInfoList().isEmpty()){
+					StringBuilder workClinetInfoIds = new StringBuilder();
+					for (WorkClientInfo workClientInfo : workContractInfo.getWorkClientInfoList()) {
+						workClinetInfoIds.append(workClientInfo.getId()).append(",");
+					}
+					workClinetInfoIds.deleteCharAt(workClinetInfoIds.length()-1);
+					workContractInfo.setWorkClinetInfoIds(workClinetInfoIds.toString());
 				}
-				workClinetInfoIds.deleteCharAt(workClinetInfoIds.length()-1);
-				workContractInfo.setWorkClinetInfoIds(workClinetInfoIds.toString());
 			}
+			projectRecords.setWorkContractInfo(workContractInfo);
 		}
-		projectRecords.setWorkContractInfo(workContractInfo);
 	}
 
 	/**

src/main/java/com/jeeplus/modules/sys/service/WorkattachmentService.java

@@ -13,6 +13,7 @@ import com.jeeplus.modules.isignature.service.ISignatureDocumentService;
 import com.jeeplus.modules.projectAccessory.dao.ProjectAccessoryDao;
 import com.jeeplus.modules.projectAccessory.entity.CollectAccessoryInfo;
 import com.jeeplus.modules.sys.dao.WorkattachmentDao;
+import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.entity.Workattachment;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.utils.ViewFileUtil;
@@ -362,9 +363,12 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 	public List<WorkClientAttachment> getAttachmentList(WorkClientAttachment workClientAttachment){
 		List<WorkClientAttachment> list = workClientAttachmentDao.findList(workClientAttachment);
 		CollectAccessoryInfo cAInfo = new CollectAccessoryInfo();
-		cAInfo.setOfficeId(UserUtils.getUser().getOffice().getId());
-		cAInfo.setCompanyId(UserUtils.getUser().getCompany().getId());
-		cAInfo.setCreateBy(UserUtils.getUser());
+		User loginUser = UserUtils.getUser();
+		if(StringUtils.isNotBlank(loginUser.getId())){
+			cAInfo.setOfficeId(loginUser.getOffice().getId());
+			cAInfo.setCompanyId(loginUser.getCompany().getId());
+			cAInfo.setCreateBy(loginUser);
+		}
 		//遍历附件信息，判定改附件信息是否被收藏
 		for (WorkClientAttachment info: list) {
 			cAInfo.setUrl(info.getUrl());
@@ -388,9 +392,12 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 	public List<WorkClientAttachment> getAttachmentListOnProjectAccessory(WorkClientAttachment workClientAttachment){
 		List<WorkClientAttachment> list = workClientAttachmentDao.getList(workClientAttachment);
 		CollectAccessoryInfo cAInfo = new CollectAccessoryInfo();
-		cAInfo.setOfficeId(UserUtils.getUser().getOffice().getId());
-		cAInfo.setCompanyId(UserUtils.getUser().getCompany().getId());
-		cAInfo.setCreateBy(UserUtils.getUser());
+		User loginUser = UserUtils.getUser();
+		if(StringUtils.isNotBlank(loginUser.getId())){
+			cAInfo.setOfficeId(loginUser.getOffice().getId());
+			cAInfo.setCompanyId(loginUser.getCompany().getId());
+			cAInfo.setCreateBy(loginUser);
+		}
 		//遍历附件信息，判定改附件信息是否被收藏
 		for (WorkClientAttachment info: list) {
 			cAInfo.setUrl(info.getUrl());
@@ -414,9 +421,12 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 	public List<WorkClientAttachment> getList(WorkClientAttachment workClientAttachment){
 		List<WorkClientAttachment> list = workClientAttachmentDao.getList(workClientAttachment);
 		CollectAccessoryInfo cAInfo = new CollectAccessoryInfo();
-		cAInfo.setOfficeId(UserUtils.getUser().getOffice().getId());
-		cAInfo.setCompanyId(UserUtils.getUser().getCompany().getId());
-		cAInfo.setCreateBy(UserUtils.getUser());
+		User loginUser = UserUtils.getUser();
+		if(StringUtils.isNotBlank(loginUser.getId())){
+			cAInfo.setOfficeId(loginUser.getOffice().getId());
+			cAInfo.setCompanyId(loginUser.getCompany().getId());
+			cAInfo.setCreateBy(loginUser);
+		}
 		//遍历附件信息，判定改附件信息是否被收藏
 		for (WorkClientAttachment info: list) {
 			cAInfo.setUrl(info.getUrl());