feat: 支持按deptId查接包对象/支持按deptId查关联积分包名称

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaAgentController.java

@@ -755,20 +755,19 @@ public class WmDaAgentController {
 	}
 
 	/**
-	 * 获取cso列表
+	 * 获取cso列表 (接包对象)
 	 *
 	 * @return cso列表 二期  业务平台
 	 */
 	@GetMapping("/listCso")
-	public R listCso(Integer id) {
-//		SysDept sysDept1 = new SysDept();
-//		sysDept1.setDeptId(SecurityUtils.getUser().getDeptId());
-//		SysDept sysDept = sysDeptMapper.selectDeptId(sysDept1);
+	public R listCso(Integer deptId) {
+
+		if (deptId == null) {
+			deptId = SecurityUtils.getUser().getDeptId();
+		}
 
-		SysDept sysDept = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
+		SysDept sysDept = sysDeptService.getById(deptId);
 
-		WmDaAgent anId = wmDaAgentService.selectByDeptId(sysDept.getDeptId());
-		WmDaDrugEnt drId = wmDaDrugEntService.selectByDeptId(sysDept.getDeptId());
 		List wmDaDrugEnts = null;
 		if (sysDept.getLevel() == 2) {
 			wmDaDrugEnts = wmDaAgentService.selectWmDaDrugEntByDeptId(sysDept.getDeptId());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -1474,21 +1474,26 @@ public class WmScorePackageController {
 	 */
 	@GetMapping("/lists")
 	public R<?> listWmScorePackages(WmScorePackage wmScorePackage) {
+		// 当前企业deptId
+		String deptId = wmScorePackage.getDeptId();
+		if (StrUtil.isBlank(deptId)) {
+			deptId = String.valueOf(SecurityUtils.getUser().getDeptId());
+		}
+
 		wmScorePackage.setDelFlag("0");
 		wmScorePackage.setEnableFlag("0");
+		wmScorePackage.setDeptId(deptId);
 		List<WmScorePackage> list = wmScorePackageService.list(Wrappers.query(wmScorePackage));
-		SysDept wmId = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
+
+		SysDept dept = sysDeptService.getById(deptId);
 
 		List<Map<String, Object>> answerList = new ArrayList<>();
-		if (wmId.getLevel() == 3) {
-			int deptId = SecurityUtils.getUser().getDeptId();
+		if (dept.getLevel() == 3) {
 			for (WmScorePackage wmScorePackage1 : list) {
 				Map<String, Object> map1 = new HashMap<>();
-				if (StrUtil.isNotBlank(wmScorePackage1.getDeptId()) && deptId == Integer.parseInt(wmScorePackage1.getDeptId())) {
-					map1.put("relationScoreId", wmScorePackage1.getId());
-					map1.put("scorePackageName", wmScorePackage1.getScorePackageName());
-					answerList.add(map1);
-				}
+				map1.put("relationScoreId", wmScorePackage1.getId());
+				map1.put("scorePackageName", wmScorePackage1.getScorePackageName());
+				answerList.add(map1);
 			}
 
 		}