收藏bug

laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardCollectionController.java

@@ -8,6 +8,12 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.MessageUtils;
 import com.jero.modules.laws.common.constant.ResultCommon;
+import com.jero.modules.laws.enterprise.entity.EnterpriseStandard;
+import com.jero.modules.laws.enterprise.service.EnterpriseStandardService;
+import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
+import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
+import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
+import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
 import com.jero.modules.personal.entity.LawsStandardCollection;
 import com.jero.modules.personal.service.ILawsStandardCollectionService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -38,6 +44,12 @@ import org.apache.poi.ss.formula.functions.T;
 public class LawsStandardCollectionController extends JeroController<LawsStandardCollection, ILawsStandardCollectionService> {
 	@Autowired
 	private ILawsStandardCollectionService lawsStandardCollectionService;
+	 @Autowired
+	 private ILawsDomesticStandardService lawsDomesticStandardService; //国内标准
+	 @Autowired
+	 private ILawsOverseasStandardService lawsOverseasStandardService; //海外标准
+	 @Autowired
+	 private EnterpriseStandardService enterpriseStandardService; //企业标准
 
 	/**
 	 * 分页列表查询
@@ -62,6 +74,10 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
 	@ApiOperation(value="标准收藏-国内收藏", notes="标准收藏-国内收藏")
 	@PostMapping(value = "/domestic/add")
 	public Result<T> domesticAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) {
+		LawsDomesticStandard standard = lawsDomesticStandardService.queryById(lawsStandardCollection.getStandardId());
+		lawsStandardCollection.setStandardClass(standard.getStandardClass());
+		lawsStandardCollection.setStandardName(standard.getStandardName());
+
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		LambdaQueryWrapper<LawsStandardCollection> wrapper = new LambdaQueryWrapper<>();
 		wrapper.eq(LawsStandardCollection::getStandardId, lawsStandardCollection.getStandardId());
@@ -97,6 +113,10 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
 	 @ApiOperation(value="标准收藏-海外收藏", notes="标准收藏-海外收藏")
 	 @PostMapping(value = "/overseas/add")
 	 public Result<T> overseasAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) {
+		 LawsOverseasStandard standard = lawsOverseasStandardService.queryById(lawsStandardCollection.getStandardId());
+		 lawsStandardCollection.setStandardClass(standard.getStandardClass());
+		 lawsStandardCollection.setStandardName(standard.getStandardName());
+
 		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		 LambdaQueryWrapper<LawsStandardCollection> wrapper = new LambdaQueryWrapper<>();
 		 wrapper.eq(LawsStandardCollection::getStandardId, lawsStandardCollection.getStandardId());
@@ -132,6 +152,10 @@ public class LawsStandardCollectionController extends JeroController<LawsStandar
 	 @ApiOperation(value="标准收藏-企标收藏", notes="标准收藏-企标收藏")
 	 @PostMapping(value = "/enterprise/add")
 	 public Result<T> enterpriseAdd(@Validated @RequestBody LawsStandardCollection lawsStandardCollection) {
+		 EnterpriseStandard standard = enterpriseStandardService.getById(lawsStandardCollection.getStandardId());
+		 lawsStandardCollection.setStandardClass(standard.getCategoryCode());
+		 lawsStandardCollection.setStandardName(standard.getStandardName());
+
 		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		 LambdaQueryWrapper<LawsStandardCollection> wrapper = new LambdaQueryWrapper<>();
 		 wrapper.eq(LawsStandardCollection::getStandardId, lawsStandardCollection.getStandardId());

laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardCollectionServiceImpl.java

@@ -98,11 +98,6 @@ public class LawsStandardCollectionServiceImpl extends ServiceImpl<LawsStandardC
 	 */
 	@Override
     public void add(LawsStandardCollection lawsStandardCollection) {
-		LawsDomesticStandard standard = lawsDomesticStandardService.queryById(lawsStandardCollection.getStandardId());
-		lawsStandardCollection.setStandardClass(standard.getStandardClass());
-		lawsStandardCollection.setStandardName(standard.getStandardName());
-		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		lawsStandardCollection.setCollectorId(sysUser.getId());
 		Date now = new Date();
         lawsStandardCollection.setCreateTime(now);
         lawsStandardCollection.setUpdateTime(now);

laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java

@@ -58,7 +58,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 	@AutoLog(value = "文档拆分表-分页列表查询Y")
 	@ApiOperation(value="文档拆分表-分页列表查询", notes="文档拆分表-分页列表查询")
 	@GetMapping(value = "/page")
-	@RequiresPermissions("split:sarFileSplitInfo:page")
+//	@RequiresPermissions("split:sarFileSplitInfo:page")
 	public Result<?> queryPageList(SarFileSplitInfoEOPage sarFileSplitInfoEOPage) {
 		QueryWrapper<SarFileSplitInfoEO> queryWrapper = new QueryWrapper<>();
 		if(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getSerialNumber())){
@@ -103,7 +103,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 	@AutoLog(value = "文档拆分表-回传至文档库")
 	@ApiOperation(value="文档拆分表-回传至文档库", notes="文档拆分表-回传至文档库")
 	@GetMapping(value = "/bindToDocumentLibrary")
-	@RequiresPermissions("split:sarFileSplitInfo:bind")
+//	@RequiresPermissions("split:sarFileSplitInfo:bind")
 	public Result<?> bindToDocumentLibrary(String id, String connectId, String fileName) {
 		// 设置fileId
 		boolean bindState = sarFileSplitInfoService.bindToDocumentLibrary(id, connectId, fileName);
@@ -123,7 +123,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 	@AutoLog(value = "文档拆分表-添加")
 	@ApiOperation(value="文档拆分表-添加", notes="文档拆分表-添加")
 	@PostMapping(value = "/add")
-	@RequiresPermissions("split:sarFileSplitInfo:add")
+//	@RequiresPermissions("split:sarFileSplitInfo:add")
 	public Result<?> add(@Validated @RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) {
 		sarFileSplitInfoService.add(sarFileSplitInfoEO);
 		return Result.OK("添加成功！");
@@ -152,7 +152,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 	@AutoLog(value = "文档拆分表-通过id删除Y")
 	@ApiOperation(value="文档拆分表-通过id删除", notes="文档拆分表-通过id删除")
 	@GetMapping(value = "/delete")
-	@RequiresPermissions("split:sarFileSplitInfo:delete")
+//	@RequiresPermissions("split:sarFileSplitInfo:delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		sarFileSplitInfoService.deleteById(id);
 		return Result.OK("删除成功!");
@@ -167,7 +167,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 	@AutoLog(value = "文档拆分表-批量删除Y")
 	@ApiOperation(value="文档拆分表-批量删除", notes="文档拆分表-批量删除")
 	@PostMapping(value = "/deleteBatch")
-	@RequiresPermissions("split:sarFileSplitInfo:deleteBatch")
+//	@RequiresPermissions("split:sarFileSplitInfo:deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.sarFileSplitInfoService.deleteByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
@@ -199,7 +199,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 	@ApiOperation(value="拆分已入库文本-分页查询", notes="拆分已入库文本-分页查询")
 	@PostMapping(value = "/splitFilePageInfo")
 	@ResponseBody
-	@RequiresPermissions("split:sarFileSplitInfo:splitFile")
+//	@RequiresPermissions("split:sarFileSplitInfo:splitFile")
 	public Result<IPage<Map<String,Object>>> splitFilePageInfo(@RequestBody Map<String,Object> parameter) {
 		IPage<Map<String,Object>> infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter);
 		return Result.OK(infoPage);
@@ -214,7 +214,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 	@ApiOperation(value="导入拆分结果-分页查询", notes="导入拆分结果-分页查询")
 	@PostMapping(value = "/splitResultPageInfo")
 	@ResponseBody
-	@RequiresPermissions("split:sarFileSplitInfo:splitResult")
+//	@RequiresPermissions("split:sarFileSplitInfo:splitResult")
 	public Result<IPage<Map<String,Object>>> splitResultPageInfo(@RequestBody Map<String,Object> parameter) {
 		IPage<Map<String,Object>> infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter);
 		return Result.OK(infoPage);
@@ -251,7 +251,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 	@AutoLog(value = "表头中英文切换")
 	@ApiOperation(value="表头中英文切换", notes="表头中英文切换")
 	@GetMapping(value = "/getHeader")
-	@RequiresPermissions("split:sarFileSplitInfo:page")
+//	@RequiresPermissions("split:sarFileSplitInfo:page")
 	public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "flag") String flag,
                                                        @RequestParam(name = "cut") String cut) {
 		List<Map<String, Object>> list = sarFileSplitInfoService.getHeader(flag, cut);
@@ -266,7 +266,7 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 	@AutoLog(value = "查询条件中英文切换")
 	@ApiOperation(value="查询条件中英文切换", notes="查询条件中英文切换")
 	@GetMapping(value = "/queryCondition")
-	@RequiresPermissions("split:sarFileSplitInfo:page")
+//	@RequiresPermissions("split:sarFileSplitInfo:page")
 	public Result<List<Map<String, Object>>> queryCondition(@RequestParam(name = "flag") String flag,
                                                             @RequestParam(name = "cut") String cut) {
 		List<Map<String, Object>> list = languageSwitchService.queryCondition(flag, cut);