Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -1479,7 +1479,12 @@ public class WorkProjectNotifyController extends BaseController {
 							return "modules/ruralprojectrecords/ruralProjectRecordsView";
 						}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 							//处理项目类别
-							List<MainDictDetail> mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+							List<MainDictDetail> mainDictList = Lists.newArrayList();
+							if("1".equals(ruralProjectRecords.getProjectType())){
+								mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+							}else if("2".equals(ruralProjectRecords.getProjectType())){
+								mainDictList = DictUtils.getMainDictList("attachment_project_sort_cost");
+							}
 							for (MainDictDetail info: mainDictList) {
 								if(ruralProjectRecords.getAttachmentProjectSort().equals(info.getValue())){
 									ruralProjectRecords.setAttachmentProjectSort(info.getLabel());