Merge remote-tracking branch 'origin/master'

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxOutsideInspectionItpServiceImpl.java

@@ -26,6 +26,8 @@ import com.rongwei.rwcommonentity.commonservers.vo.SysSerialVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
@@ -134,6 +136,7 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
     }
 
     @Override
+    @Transactional(isolation = Isolation.READ_COMMITTED)
     public R operInspectionStatus(List<OperOutsideInspectionVo> vo) {
         /* 10: 取消 20: 拒收 30: 派单 40: 转派 50: 接收 60: 有条件接收 */
 //        String operType = vo.getOperType();
@@ -150,16 +153,16 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
         List<ZhcxOutsideInspectionItpDo> inspectionItpDos = new ArrayList<>();
         SysUserVo user = zhcxCommon.getCurrentUser();
         log.info("当前登录用户ID"+user.getId());
-        List<SysRoleDo> roleDos = user.getRoleDos();
-        for (int x = 0; x < roleDos.size(); x++) {
-            if("role065".equals(roleDos.get(x).getCode())){
-                hasQcRole = true;
-            }else if("role061".equals(roleDos.get(x).getCode())){
-                hasZgRole = true;
-            }else if("role062".equals(roleDos.get(x).getCode())){
-                hasJjyRole = true;
-            }
-        }
+//        List<SysRoleDo> roleDos = user.getRoleDos();
+//        for (int x = 0; x < roleDos.size(); x++) {
+//            if("role065".equals(roleDos.get(x).getCode())){
+//                hasQcRole = true;
+//            }else if("role061".equals(roleDos.get(x).getCode())){
+//                hasZgRole = true;
+//            }else if("role062".equals(roleDos.get(x).getCode())){
+//                hasJjyRole = true;
+//            }
+//        }
         for(int i =0;i<vo.size();i++){
             String operType = vo.get(i).getOperType();
             String itpId = vo.get(i).getItpId();