1.监审目录管理权限

assistMg/src/main/java/com/hotent/baseInfo/controller/CostCatalogController.java

@@ -46,7 +46,7 @@ public class CostCatalogController {
      */
     @PostMapping("/list")
     @ApiOperation(value = "查询监审目录树及列表数据", notes = "支持树形结构展示和多条件查询")
-    public CommonResult<List<SumTree<CatalogTreeVo>>> getCatalogList(@RequestBody CostCatalogPageReq req) {
+    public CommonResult<List<SumTree<CatalogTreeVo>>> getCatalogList(@RequestBody CostCatalogPageReq req) throws Exception {
 
         List<CostCatalog> catalogList = costCatalogManager.getCatalogList(req);
 

assistMg/src/main/java/com/hotent/baseInfo/manager/CostCatalogManager.java

@@ -32,7 +32,7 @@ public interface CostCatalogManager extends BaseManager<CostCatalog> {
 	 * @param req 查询条件
 	 * @return 目录列表
 	 */
-	List<CostCatalog> getCatalogList(CostCatalogPageReq req);
+	List<CostCatalog> getCatalogList(CostCatalogPageReq req) throws Exception;
 
 	/**
 	 * 新增目录类别

assistMg/src/main/java/com/hotent/baseInfo/manager/impl/CostCatalogManagerImpl.java

@@ -12,8 +12,12 @@ import com.hotent.baseInfo.manager.CostCatalogManager;
 import com.hotent.baseInfo.req.CostCatalogPageReq;
 import com.hotent.base.manager.impl.BaseManagerImpl;
 import com.hotent.constant.BaseConstant;
+import com.hotent.uc.api.model.IUser;
+import com.hotent.uc.manager.UserManager;
+import com.hotent.uc.model.User;
 import com.hotent.uc.util.ContextUtil;
 import com.hotent.util.CopyUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -35,6 +39,10 @@ import com.hotent.base.util.StringUtil;
 @Service
 public class CostCatalogManagerImpl extends BaseManagerImpl<CostCatalogDao, CostCatalog> implements CostCatalogManager {
 
+    @Autowired
+    private UserManager userService;
+
+
     @Override
     public CostCatalog getDetail(String id) {
         CostCatalog costCatalog = this.get(id);
@@ -64,7 +72,7 @@ public class CostCatalogManagerImpl extends BaseManagerImpl<CostCatalogDao, Cost
 //    }
 
     @Override
-    public List<CostCatalog> getCatalogList(CostCatalogPageReq req) {
+    public List<CostCatalog> getCatalogList(CostCatalogPageReq req) throws Exception {
         // 获取所有未删除的数据
         LambdaQueryWrapper<CostCatalog> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CostCatalog::getIsDeleted, "0");
@@ -77,6 +85,12 @@ public class CostCatalogManagerImpl extends BaseManagerImpl<CostCatalogDao, Cost
         if (StringUtil.isNotEmpty(req.getCatalogName())) {
             queryWrapper.like(CostCatalog::getCatalogName, req.getCatalogName());
         }
+
+        IUser iUser = ContextUtil.getCurrentUser();
+        User user = userService.getByAccount(iUser.getAccount());
+        if (user!=null) {
+            queryWrapper.like(CostCatalog::getPriceLevel,user.getDataScope());
+        }
         List<CostCatalog> allCatalogs = this.list(queryWrapper);
 //
 //        // 如果没有查询条件，返回所有数据

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectDocumentManagerImpl.java

@@ -82,6 +82,8 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
 
     @Autowired
     private CostDocumentTemplateFileManager costTemplateFileManager;
+    
+    private static final HashMap<String, Boolean> whMap = new HashMap<>();
 
     @Override
     public CostProjectDocument getDetail(String id) {
@@ -202,8 +204,15 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
             throw new BaseException("文书文号不存在");
         }
         //返回文号
-        String whNo = costDocumentWh.getRulePattern().replace("{prefixText}", costDocumentWh.getPrefixText())
-                .replace("{year}", costDocumentWh.getYear()).replace("{currentValue}", costDocumentWh.getCurrentValue().toString());
+        String whNo = this.getWH(costDocumentWh);
+        //校验文号唯一性
+        Boolean b = whMap.get(whNo);
+        if (!b) {
+            whMap.put(whNo,true);
+        }else {
+            throw new BaseException("【"+whNo+"】文号已存在请重新添加");
+        }
+
 
         LambdaQueryWrapper<CostProjectDocument> qw = new LambdaQueryWrapper<>();
         qw.eq(CostProjectDocument::getProjectId, req.getProjectId());
@@ -315,7 +324,13 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
         //更新文号值
         costDocumentWhManager.updateCurrentValue(costDocumentWh.getId());
 
+        whMap.remove(whNo);
+    }
+
+    public synchronized String getWH(CostDocumentWh costDocumentWh){
 
+        return costDocumentWh.getRulePattern().replace("{prefixText}", costDocumentWh.getPrefixText())
+                .replace("{year}", costDocumentWh.getYear()).replace("{currentValue}", costDocumentWh.getCurrentValue().toString());
     }
 
     @Override