bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SupervisionUnitController.java

@@ -96,7 +96,7 @@ public class SupervisionUnitController extends BaseController {
      * @param bean 监理单位实体
      * @return 结果
      */
-    @PostMapping("/updateSupervisionUnitUser")
+    @PutMapping("/updateSupervisionUnitUser")
     @SysLog(title = "监理单位管理", businessType = OperaType.UPDATE, logType = 0, module = "外来单位管理->监理单位总监")
     public AjaxResult updateSupervisionUnitUser(@Validated @RequestBody SupervisionUnit bean) {
         try {

bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ProjectServiceImpl.java

@@ -237,9 +237,10 @@ public class ProjectServiceImpl implements ProjectService {
             result = projectMapper.addSupervisoryUnit(bean);
             if (result > 0) {
                 // 抛出异常触发事务回滚
+                TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
                 return  AjaxResult.success("添加成功");
             }
-            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+
             // 返回操作结果，可能是插入的记录数或者其他标识
         } catch (Exception e) {
             // 手动进行回滚

bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java

@@ -401,7 +401,7 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService {
             for (Long id:addressId){
                 List<Project> list = suMapper.getSupProUserNum(id);
                 if(StringUtils.isNotEmpty(list)){
-                    return  AjaxResult.error(list.get(0).getSupervisorUnit()+"存在工程信息,不允许删除");
+                    return  AjaxResult.success(list.get(0).getSupervisorUnit()+"存在工程信息,不允许删除");
                 }
             }
         }

bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml

@@ -117,13 +117,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join (
         select count(1) num ,  sup_unit_id
         from pt_project_info
-        where sup_unit_id is not null and sup_unit_id!='' and  is_active=1
+        where sup_unit_id is not null and sup_unit_id!=''
         GROUP BY  sup_unit_id
         )pro on pro.sup_unit_id=psi.id
         left join(
         select count(1) num ,unit_id
         FROM  pt_sup_info
-        where   is_active=1
         GROUP BY unit_id
         )us on us.unit_id=psi.id
         where psi.is_active = 1
@@ -133,23 +132,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="listSupervisionUnitUser" resultType="com.bonus.project.domain.SupervisionUnit">
         select (@rowNum := @rowNum + 1) as exportId,
-        sup_id supId,
+               sup_id supId,
-        comm_user_id commUserId,
+               comm_user_id commUserId,
-        comm_user_name directorsName,
+               comm_user_name directorsName,
-        comm_user_phone directorsPhone,
+               comm_user_phone directorsPhone,
-        comm_user_code commUserCode,
+               comm_user_code commUserCode
-        IFNULL(pro.num,0) status
         from (select @rowNum := 0) r,
-        pt_sup_info psi
+             pt_sup_info
-        left join (
-            select count(1) num ,  sup_user_id
-            from pt_project_info
-            where sup_user_id is not null and sup_user_id!=''  and  is_active=1
-            GROUP BY  sup_user_id
-        )pro on pro.sup_user_id=psi.sup_id
         where  is_active=1 and unit_id=#{unitId}
         <if test="directorsName != null and directorsName != ''">
-            and comm_user_name  like concat('%',#{directorsName},'%')
+            and comm_user_phone  like concat('%',#{directorsName},'%')
         </if>
     </select>
     <select id="listSupEntry" resultType="com.bonus.project.domain.SupervisionOfAdmission">