FIX4.2

720yun_fd_manage/gis_mapper/src/main/java/com/gis/mapper/provider/WorkProvider.java

@@ -50,7 +50,7 @@ public class WorkProvider {
 //            sql.append(" and (  sn_code in (").append(StringUtils.join(snCodes, ",")).append(") )");
             sql.append(" and (  sn_code in ('").append(StringUtils.join(snCodes, "','")).append("') )");
         }else {
-            sql.append(" and status > 0");
+            sql.append(" and status > 0 and type !='pro'");
         }
 
 

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -425,7 +425,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
         String userNameForToken = getUserNameForToken();
         if (!userNameForToken.equals(entity.getUserId())&&ObjectUtil.isNotEmpty(entity.getType())&&!entity.getType().equalsIgnoreCase("pro")) {
             return Result.failure(ErrorEnum.FAILURE_SYS_3011.code(), "当前无操作权限");
-        } else {
+        } else if (ObjectUtil.isNotEmpty(entity.getType())&&entity.getType().equalsIgnoreCase("pro")){
             JSONObject cameraList =fdkkClient.getCameraListByToken(getToken(),"3,4,5");
             List<String> snCodes = new ArrayList<>();
             if (cameraList.getInteger("code") == 0) {

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/WorkController.java

@@ -163,7 +163,7 @@ public class WorkController extends BaseController {
 
         if (!userId.equals(entity.getUserId())&&ObjectUtil.isNotEmpty(entity.getType())&&!entity.getType().equalsIgnoreCase("pro")) {
             return Result.failure(MsgCode.e3005, "当前无操作权限");
-        }else {
+        } else if (ObjectUtil.isNotEmpty(entity.getType())&&entity.getType().equalsIgnoreCase("pro")){
             JSONObject cameraList =fdkkClient.getCameraListByToken(getToken(),"3,4,5");
             List<String> snCodes = new ArrayList<>();
             if (cameraList.getInteger("code") == 0) {