修改市场法规清单直接发布按钮

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java

@@ -191,6 +191,7 @@ public class MarketStandardController {
         return Result.OK(ResultCommon.OK);
     }
 
+
     /**
      * 发布
      *
@@ -203,10 +204,28 @@ public class MarketStandardController {
     @PostMapping(value = "/publish")
     @RequiresPermissions("marketStandard:publish")
     public Result<?> publish(@RequestBody Map<String, String> map) {
+        if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) {
+            return Result.error(ResultCommon.SELECT_DATA);
+        }
+        return marketStandardService.checkPublish(map.get("id"));
+    }
+
+    /**
+     * 直接发布
+     *
+     * @param map
+     * @return
+     */
+    @AutoLog(value = "外部标准库-市场法规清单-直接发布")
+    @ApiOperation(value = "外部标准库-市场法规清单-直接发布", notes = "外部标准库-市场法规清单-直接发布")
+    @ApiOperationSupport(order = 7)
+    @PostMapping(value = "/directRelease")
+    @RequiresPermissions("marketStandard:directRelease")
+    public Result<?> directRelease(@RequestBody Map<String, String> map) {
         if (!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))) {
             return Result.error(ResultCommon.SELECT_DATA);
         }
-        return marketStandardService.checkPublish(map.get("ids"));
+        return marketStandardService.directRelease(map.get("ids"));
     }
 
     /**

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java

@@ -94,6 +94,13 @@ public interface ILawsMarketStandardService extends IService<LawsMarketStandard>
      */
     Result<?> checkPublish(String id);
 
+    /**
+     * 直接发布
+     * @param ids
+     * @return
+     */
+    Result<?>  directRelease(String ids);
+
     /**
      * 发布
      * @param id

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java

@@ -490,7 +490,28 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
     }
 
     @Override
-    public synchronized Result<?> checkPublish(String ids) {
+    public synchronized Result<?> checkPublish(String id) {
+        LawsMarketStandard lawsMarketStandardOld = getById(id);
+        if(Objects.isNull(lawsMarketStandardOld)){
+            return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
+        }
+        // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
+                && Arrays.stream(sysUser.getRoleIds().split(",")).noneMatch(otherAdmin::contains)
+                && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
+                && !Objects.equals(lawsMarketStandardOld.getAuthor(),sysUser.getId())){
+            return Result.error(ResultCommon.NO_PERMISSION);
+        }
+        if(Objects.equals(lawsMarketStandardOld.getManifestStatus(),MarketStandardConstants.MANIFEST_STATUS_PUBLISH)){
+            return Result.error(ResultCommon.DATA_PUBLISHED);
+        }
+        processMarketStandardReleaseService.checkProcessStatus(id);
+        return Result.OK(ResultCommon.OK);
+    }
+
+    @Override
+    public Result<?> directRelease(String ids) {
         List<String> listIds = Arrays.asList(ids.split(","));
         List<LawsMarketStandard> lawsMarketStandardOldList = listByIds(listIds);
         if(listIds.size() != lawsMarketStandardOldList.size()){