修改添加成员无法审核问题

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralWorkProjectUserDao.java

@@ -26,4 +26,11 @@ public interface RuralWorkProjectUserDao {
 
     int reInsertUser(RuralProjectRecords projectRecords);
 //    int reInsertUser(@Param("projectId")String projectId,@Param("userId")String userId);
+
+    /**
+     * 获取项目负责人
+     * @param projectId
+     * @return
+     */
+    List<User> getProjectprincipalList(@Param("projectId") String projectId);
 }

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

@@ -157,7 +157,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         //查询负责人信息
         for (RuralProjectRecords records : recordsList) {
             this.queryContractInfos(records);
-            List<User> users = workProjectUserDao.queryProjectUsers(records.getId(), "1");
+            //获取项目负责人
+            List<User> users = workProjectUserDao.getProjectprincipalList(records.getId());
             records.setProjectLeaders(users);
             records.setLeaderNameStr(Collections3.extractToString(users, "name", ","));
             records.setLeaderIds(Collections3.extractToString(users, "id", ","));

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -204,8 +204,8 @@ public class RuralProjectMessageController extends BaseController {
      * @return
      */
     @RequestMapping(value = {"saveReport"})
-    public String saveReport(Projectcontentinfo projectcontentinfo, Model model,RedirectAttributes redirectAttributes)  {
-        try{
+    public String saveReport(Projectcontentinfo projectcontentinfo, Model model,RedirectAttributes redirectAttributes) throws Exception {
+        //try{
             String str = ruralProjectMessageService.saveData(projectcontentinfo,2);
             addMessage(redirectAttributes, "发起报告审批"+(str.equals("true")?"成功":"失败"));
             ProjectReportData projectReportData = projectcontentinfo.getProjectReportData();
@@ -215,9 +215,9 @@ public class RuralProjectMessageController extends BaseController {
                 }
                 return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
             }
-        }catch (Exception e){
+        /*}catch (Exception e){
             logger.error("ProjectcontentinfoController save Exception e"+e);
-        }
+        }*/
         if(UserUtils.isManager()){
             model.addAttribute("flag","1");
         }

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml

@@ -127,7 +127,6 @@
 		o.top_company AS "office.name",
 		ifnull(prd.number ,"") as "projectReportNumber"
 		,ifnull(prd.status,0) as "projectReportStatus"
-        ,su.name AS "createBy.name"
         ,o.top_company AS "office.name"
         FROM rural_project_records a
 		LEFT JOIN sys_area area ON area.id = a.area_id

src/main/resources/mappings/modules/workProjectUser/RuralWorkProjectUserDao.xml

@@ -66,6 +66,11 @@
     <select id="queryProjectUsers" resultType="com.jeeplus.modules.sys.entity.User">
         SELECT u.id,u.name,u.photo from work_project_user a, sys_user u WHERE a.user_id = u.id and a.project_id = #{projectId} and a.is_master = #{isMaster}
     </select>
+
+    <select id="getProjectprincipalList" resultType="com.jeeplus.modules.sys.entity.User">
+        SELECT u.id,u.name,u.photo from work_project_user a, sys_user u WHERE a.user_id = u.id and a.project_id = #{projectId} and a.del_flag=0
+    </select>
+
     <select id="projectUsers" resultType="com.jeeplus.modules.sys.entity.User">
         SELECT u.id,u.name,u.photo from work_project_user a, sys_user u WHERE a.user_id = u.id and a.project_id = #{projectId} and a.del_flag = '0'
     </select>