init: init project step4: biz code support

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

@@ -1118,9 +1118,9 @@ public class SysUserController {
         HnqzUser user = SecurityUtils.getUser();
         List<Integer> roles = SecurityUtils.getRoles();
 
-        // 平台管理员
+        // admin || 平台管理员
         List<Tree<Long>> userAreaTree;
-        if (roles.contains(2)) {
+        if (roles.contains(2) || roles.contains(1)) {
             userAreaTree = areaEntityService.selectTree(new SysAreaEntity());
         }
         //  药企管理员（事业部） || 区域管理员（一级cso管理员）

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

@@ -100,40 +100,7 @@ public class WmDaAgentController {
      */
     @GetMapping("/page")
     public R<?> getWmDaAgentPage(Page page, WmDaAgent wmDaAgent) {
-//		if(SecurityUtils.getRoles().contains(1) ||SecurityUtils.getRoles().contains(2))
-//		{
-//			//管理员和平台管理员不做处理
-//		}else{
-////			wmDaAgent.setDrugEntId(SecurityUtils.getUser().getDrugEntId());
-//		}
-//
-//		OrderItem orderItem=new OrderItem();
-//		orderItem.setColumn("create_time");
-//		orderItem.setAsc(false);
-//		page.addOrder(orderItem);
-//		IPage<WmDaAgent>  answerPage= wmDaAgentService.listPage(page, wmDaAgent);
-//		if (answerPage != null) {
-//			List<WmDaAgent>	list = answerPage.getRecords();
-//			if (list.size() > 0) {
-//				for (WmDaAgent wmd : list) {
-////				wmd.setUpdateUser(getBuildName(wmd.getDeptId(),"agent"));
-//					if (null != wmd.getExtDrugEnt()) {
-//						String[] ents = wmd.getExtDrugEnt().split(",");
-//						List<WmDaDrugEnt> listEnts = wmDaDrugEntService.listByIds(Arrays.asList(ents));
-//						String temp1 = "";
-//						if (listEnts.size() > 0) {
-//							for (WmDaDrugEnt wmD : listEnts) {
-//								temp1 += wmD.getEntname() + ",";
-//							}
-//							temp1 = temp1.substring(0, temp1.length() - 1);
-//						}
-//						wmd.setTemp1(temp1);
-//					}
-//
-//				}
-//			}
-//			answerPage.setRecords(list);
-//		}
+
 
         WmRelation wmRelation = new WmRelation();
         wmRelation.setUpId(SecurityUtils.getUser().getDeptId());