xxx

src/main/java/com/yunzhi/marketing/base/BaseController.java

@@ -137,10 +137,11 @@ public class BaseController {
         if (taUser == null) {
             return null;
         }
-        // 个人授权条件
-        QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
-        taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
-        List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
+//        // 个人授权条件
+//        QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
+//        taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
+//        List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
+        List<TaPersonBuilding> taPersonBuildingList = new ArrayList<>();
         // 新的过滤条件组织机构
         LambdaQueryWrapper<TaBuilding> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.likeRight(TaBuilding::getInstitutionCode,taUser.getInstitutionCode());

src/main/java/com/yunzhi/marketing/center/taUser/controller/TaUserController.java

@@ -16,6 +16,7 @@ import com.yunzhi.marketing.center.taUser.service.*;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.JWTUtils;
 import com.yunzhi.marketing.common.MD5Utils;
+import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.mapper.TaRoleMapper;
 import com.yunzhi.marketing.entity.*;
 import com.yunzhi.marketing.service.*;
@@ -519,6 +520,9 @@ public class TaUserController extends BaseController {
     public ResponseBean adminUserAdd(@RequestBody TaUser taUser,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            if (StringUtils.isEmpty(taUser.getInstitutionCode())){
+                return ResponseBean.error("组织机构必填", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            }
             taUser.setOrgId(getOrgId(request));
             responseBean.addSuccess(iTaUserService.addAdminUser(taUser));
         }catch (Exception e){

src/main/java/com/yunzhi/marketing/center/taUser/service/impl/TaUserServiceImpl.java

@@ -482,18 +482,20 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             taPersonBuilding.setUserId(taUser.getUserId());
             taPersonBuilding.setCreateDate(LocalDateTime.now());
             taPersonBuildingMapper.insert(taPersonBuilding);
-        } else {
-            //非置业顾问可授权多个项目
-            List<String> buildingIdList = taUser.getBuildingIds();
-            LocalDateTime nowTime = LocalDateTime.now();
-            buildingIdList.forEach(e -> {
-                TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
-                taPersonBuilding.setBuildingId(e);
-                taPersonBuilding.setUserId(taUser.getUserId());
-                taPersonBuilding.setCreateDate(nowTime);
-                taPersonBuildingMapper.insert(taPersonBuilding);
-            });
         }
+//        // 这个版本取消非置业顾问授权
+//        else {
+//            //非置业顾问可授权多个项目
+//            List<String> buildingIdList = taUser.getBuildingIds();
+//            LocalDateTime nowTime = LocalDateTime.now();
+//            buildingIdList.forEach(e -> {
+//                TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+//                taPersonBuilding.setBuildingId(e);
+//                taPersonBuilding.setUserId(taUser.getUserId());
+//                taPersonBuilding.setCreateDate(nowTime);
+//                taPersonBuildingMapper.insert(taPersonBuilding);
+//            });
+//        }
 
         return taUser;
     }

src/main/java/com/yunzhi/marketing/xlk/entity/TaPolicyType.java

@@ -45,5 +45,15 @@ public class TaPolicyType implements Serializable {
      */
     private Integer orgId;
 
+    /** 父id */
+    private String parentPolicyTypeId ;
+    /** 徽章 */
+    private String badge ;
+    /** 图标 */
+    private String icon ;
+    /** 排序 */
+    private Integer sort ;
+    /** 颜色 */
+    private String color ;
 
 }