优化代码结构

wisenergy-mapper/src/main/resources/mapper/WorkUserMapper.xml

@@ -130,7 +130,7 @@
     <select id="getUserRoleDto" resultMap="UserRoleMap">
 
       select u.id as 'id',u.name as 'name',u.status as 'status',if(r.id is null,0,r.id) as 'role_id',r.name as 'role_name',d.id as 'dept_id',d.dept_name,u.submit_order
-from work_user u LEFT JOIN (select role_id,user_id FROM work_user_role GROUP BY user_id) ur ON u.id = ur.user_id
+from work_user u LEFT JOIN (select role_id,user_id FROM work_user_role) ur ON u.id = ur.user_id
 LEFT JOIN work_dept d ON u.dept_id = d.id
 LEFT JOIN work_role r on ur.role_id = r.id
         <where>

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectServiceImpl.java

@@ -363,6 +363,9 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             workProjectChanges.add(workProjectChange);
         }
         if (!StringUtils.isBlank(modifyProjectVo.getWorkTimeReason())) {
+            if (null == modifyProjectVo.getWorkTime()) {
+                throw new BaseCustomException("666", "请填写工时预算");
+            }
             WorkProjectChange workProjectChange = new WorkProjectChange();
             workProjectChange.setProjectId(modifyProjectVo.getProjectId());
             workProjectChange.setModifyTime(new Date());
@@ -375,6 +378,9 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             workProjectChanges.add(workProjectChange);
         }
         if (!StringUtils.isBlank(modifyProjectVo.getCostBudgetReason())) {
+            if (null == modifyProjectVo.getCostBudget()) {
+                throw new BaseCustomException("666", "请填写成本预算");
+            }
             WorkProjectChange workProjectChange = new WorkProjectChange();
             workProjectChange.setProjectId(modifyProjectVo.getProjectId());
             workProjectChange.setModifyTime(new Date());