公共指标处理 删除方法

ims-service/ims-eval/src/main/java/com/ims/eval/controller/OrganizationEvaluationCommonInfoController.java

@@ -59,12 +59,12 @@ public class OrganizationEvaluationCommonInfoController {
 	 * @param deptIds
 	 * @return
 	 */
-	@PostMapping(value = "/remove/{ids}")
+	@PostMapping(value = "/remove")
 	@ApiOperation(value = "删除", notes = "删除")
 	public R deleteAll(@RequestParam(value = "organizationEvaluationId", required = false) String organizationEvaluationId,
 					   @RequestParam(value = "indicatorId", required = false) String indicatorId,
 					   @RequestParam(value = "organizationId", required = false) String organizationId,
-					   @RequestParam(value = "deptId", required = false) List<String>  deptIds) {
+					   @RequestParam(value = "deptId", required = false) String  deptIds) {
 		boolean b = organizationEvaluationCommonInfoService.removeCommonInfos(organizationEvaluationId,indicatorId,organizationId,deptIds);
 		if (b) {
 			return R.ok().data(b);

ims-service/ims-eval/src/main/java/com/ims/eval/service/IOrganizationEvaluationCommonInfoService.java

@@ -22,6 +22,6 @@ public interface IOrganizationEvaluationCommonInfoService extends IService<Organ
 
 	Map getListAll(String organizationEvaluationId, String indicatorId, String organizationId, String deptId);
 
-	boolean removeCommonInfos(String organizationEvaluationId, String indicatorId, String organizationId, List<String> deptId);
+	boolean removeCommonInfos(String organizationEvaluationId, String indicatorId, String organizationId,String deptId);
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/OrganizationEvaluationCommonInfoServiceImpl.java

@@ -211,7 +211,7 @@ public class OrganizationEvaluationCommonInfoServiceImpl extends ServiceImpl<Org
 	}
 
 	@Override
-	public boolean removeCommonInfos(String organizationEvaluationId, String indicatorId, String organizationId, List<String> deptId) {
+	public boolean removeCommonInfos(String organizationEvaluationId, String indicatorId, String organizationId, String deptId) {
 		QueryWrapper<OrganizationEvaluationCommonInfo> qw = new QueryWrapper<>();
 
 		if (StringUtils.isNotEmpty(organizationEvaluationId)) {
@@ -224,7 +224,7 @@ public class OrganizationEvaluationCommonInfoServiceImpl extends ServiceImpl<Org
 			qw.lambda().eq(OrganizationEvaluationCommonInfo::getOrganizationId, organizationId);
 		}
 		if (StringUtils.isNotEmpty(deptId)) {
-			qw.lambda().in(OrganizationEvaluationCommonInfo::getDeptId, deptId);
+			qw.lambda().eq(OrganizationEvaluationCommonInfo::getDeptId, deptId);
 		}
 		List<OrganizationEvaluationCommonInfo> list = baseMapper.selectList(qw);