修改审核问题

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/common/ZsyzCommonServiceImpL.java

@@ -135,6 +135,14 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         if (!TWO.equals(progress)) {
             return AjaxResult.error("当前项目进度异常,承接地无法审核");
         }
+        //判断该项目的承接地是否是该用户
+        ZsyzSbbzb zsyzSbbzb1 = zsyzSbbzbMapper.selectZsyzSbbzbById(zsyzShyj.getXmId());
+        if (zsyzSbbzb1 != null) {
+            Long cjdId = zsyzSbbzb1.getCjdId();
+            if (!cjdId.equals(SecurityUtils.getDeptId())) {
+                return AjaxResult.error("您不是当前项目得指定承接地,无法审核");
+            }
+        }
         //获取审核结果
         String shjg = zsyzShyj.getShjg();
         //需要判断是否已经回复过该条指派
@@ -271,6 +279,9 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         zsyzProjectDept.setDeptType(TWO);
         zsyzProjectDept.setIsDel("N");
         List<ZsyzProjectDept> zsyzProjectDepts = projectDeptService.selectZsyzProjectDeptList(zsyzProjectDept);
+        if (zsyzProjectDepts == null || zsyzProjectDepts.size() == 0){
+            return AjaxResult.error("您不是当前项目得指定的部门,无法审核");
+        }
         ZsyzProjectDept zsyzProjectDept1 = zsyzProjectDepts.get(0);
         if (zsyzProjectDept1 != null && "Y".equals(zsyzProjectDept1.getIsHf())) {
             return AjaxResult.error("当前项目已经回复过");
@@ -341,10 +352,10 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                                 //清空要素部门和引资单位中间表
                                 projectDeptService.deleteZsyzProjectDeptByXmId(zsyzShyj.getXmId());
                             }
-                        }else {
+                        } else {
                             //要素部门都回复了但是没有都同意
                             //判断承接地有没有回复
-                            if ("Y".equals(zsyzProjectDeptsCjd.get(0).getIsHf())){
+                            if ("Y".equals(zsyzProjectDeptsCjd.get(0).getIsHf())) {
                                 //如果承接地回复了
                                 //说明都回复过 项目回到 项目首谈已审核,清空承接地信息
                                 zsyzSbbzb.setProgress(ONE);
@@ -579,7 +590,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                 }
                 List<ZsyzSbbzb> cjList = collect.get(TWO);
                 if (cjList != null) {
-                    stNub = stNub +  cjList.size();
+                    stNub = stNub + cjList.size();
                 }
                 List<ZsyzSbbzb> qyList = collect.get(THR);
                 if (qyList != null) {
@@ -653,9 +664,9 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                     String jPushVO = "";
                     List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
                     listS.removeAll(Collections.singleton(null));
-                    if(listS!=null && listS.size()>0){
-                        String[]  registrationId = listS.toArray(new String[listS.size()]);
-                        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+                    if (listS != null && listS.size() > 0) {
+                        String[] registrationId = listS.toArray(new String[listS.size()]);
+                        JPushToolUtil.sendToRegistrationId(notificationTitle, msgTitle, msgContent, jPushVO, registrationId);
                     }
                     for (SysUser sysUser : sysUsers) {
                         if (StringUtils.isNotEmpty(sysUser.getPhonenumber())) {
@@ -688,9 +699,9 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                     String jPushVO = "";
                     List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
                     listS.removeAll(Collections.singleton(null));
-                    if(listS!=null && listS.size()>0){
-                        String[]  registrationId = listS.toArray(new String[listS.size()]);
-                        JPushToolUtil.sendToRegistrationId(notificationTitle,msgTitle,msgContent,jPushVO,registrationId);
+                    if (listS != null && listS.size() > 0) {
+                        String[] registrationId = listS.toArray(new String[listS.size()]);
+                        JPushToolUtil.sendToRegistrationId(notificationTitle, msgTitle, msgContent, jPushVO, registrationId);
                     }
                     for (SysUser sysUser : sysUsers) {
                         if (StringUtils.isNotEmpty(sysUser.getPhonenumber())) {