1、手机端业主身份证绑定开关映射2、添加员工默认员工权限去除

service-api/src/main/java/com/java110/api/listener/owner/OwnerRegisterListener.java

@@ -43,6 +43,11 @@ import java.util.List;
 @Java110Listener("ownerRegisterListener")
 public class OwnerRegisterListener extends AbstractServiceApiPlusListener {
 
+    //域
+    public static final String DOMAIN_COMMON = "DOMAIN.COMMON";
+
+    //键
+    public static final String ID_CARD_SWITCH = "ID_CARD_SWITCH";
 
     private static final int DEFAULT_SEQ_COMMUNITY_MEMBER = 2;
 
@@ -134,6 +139,14 @@ public class OwnerRegisterListener extends AbstractServiceApiPlusListener {
             //ownerDto.setIdCard(reqJson.getString("idCard"));
             ownerDto.setName(reqJson.getString("appUserName"));
             ownerDto.setLink(reqJson.getString("link"));
+
+            //取出开关映射的值
+            String val = MappingCache.getValue(DOMAIN_COMMON, ID_CARD_SWITCH);
+            //取出身份证
+            String idCard = reqJson.getString("idCard");
+            if (val.equals("1") && idCard != null) {
+                ownerDto.setIdCard(idCard);
+            }
             List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
 
             Assert.listOnlyOne(ownerDtos, "填写业主信息错误");
@@ -164,9 +177,9 @@ public class OwnerRegisterListener extends AbstractServiceApiPlusListener {
             paramObj.put("tel", paramObj.getString("link"));
             userBMOImpl.registerUser(paramObj, dataFlowContext);
 
-        }catch (Exception e){
+        } catch (Exception e) {
             context.setServiceBusiness(null);
-            context.setResponseEntity(ResultVo.createResponseEntity(ResultVo.CODE_UNAUTHORIZED,e.getMessage()));
+            context.setResponseEntity(ResultVo.createResponseEntity(ResultVo.CODE_UNAUTHORIZED, e.getMessage()));
         }
     }
 

service-api/src/main/java/com/java110/api/listener/user/AddStaffServiceListener.java

@@ -43,7 +43,6 @@ public class AddStaffServiceListener extends AbstractServiceApiPlusListener {
     @Autowired
     private IFileInnerServiceSMO fileInnerServiceSMOImpl;
 
-
     @Override
     public String getServiceCode() {
         return ServiceCodeConstant.SERVICE_CODE_USER_STAFF_ADD;
@@ -54,31 +53,24 @@ public class AddStaffServiceListener extends AbstractServiceApiPlusListener {
         return HttpMethod.POST;
     }
 
-
     @Override
     public int getOrder() {
         return 0;
     }
 
-
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-
     }
 
     @Override
     protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-//获取数据上下文对象
-
-
+        //获取数据上下文对象
         Assert.jsonObjectHaveKey(reqJson, "storeId", "请求参数中未包含storeId 节点，请确认");
         Assert.jsonObjectHaveKey(reqJson, "storeTypeCd", "请求参数中未包含storeTypeCd 节点，请确认");
         //判断请求报文中包含 userId 并且 不为-1时 将已有用户添加为员工，反之，则添加用户再将用户添加为员工
         String userId = "";
         String oldUserId = "";
-
         String relCd = reqJson.getString("relCd");//员工 组织 岗位
-
         if (!reqJson.containsKey("userId") || "-1".equals(reqJson.getString("userId"))) {
             //将userId 强制写成-1
             oldUserId = "-1";
@@ -86,18 +78,13 @@ public class AddStaffServiceListener extends AbstractServiceApiPlusListener {
             reqJson.put("userId", userId);
             //添加用户
             userBMOImpl.addUser(reqJson, context);
-
         }
-
         reqJson.put("userId", userId);
         reqJson.put("relCd", "-1".equals(oldUserId) ? StoreUserRelConstant.REL_COMMON : StoreUserRelConstant.REL_ADMIN);
-
         userBMOImpl.addStaff(reqJson, context);
-
         //重写 员工岗位
         reqJson.put("relCd", relCd);
         userBMOImpl.addStaffOrg(reqJson, context);
-
         if (reqJson.containsKey("photo") && !StringUtils.isEmpty(reqJson.getString("photo"))) {
             FileDto fileDto = new FileDto();
             fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
@@ -108,7 +95,6 @@ public class AddStaffServiceListener extends AbstractServiceApiPlusListener {
             String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
             reqJson.put("photoId", fileDto.getFileId());
             reqJson.put("fileSaveName", fileName);
-
             JSONObject businessUnit = new JSONObject();
             businessUnit.put("fileRelId", "-1");
             businessUnit.put("relTypeCd", "12000");
@@ -119,16 +105,11 @@ public class AddStaffServiceListener extends AbstractServiceApiPlusListener {
             FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
             super.insert(context, fileRelPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FILE_REL);
         }
-
         commit(context);
-
         //如果不成功直接返回
         if (context.getResponseEntity().getStatusCode() != HttpStatus.OK) {
             return;
         }
-
-        //赋权
-        privilegeUserDefault(context, reqJson);
     }
 
     /**
@@ -156,11 +137,8 @@ public class AddStaffServiceListener extends AbstractServiceApiPlusListener {
         HttpEntity<String> httpEntity = new HttpEntity<String>(paramInObj.toJSONString(), header);
         doRequest(dataFlowContext, appService, httpEntity);
         responseEntity = dataFlowContext.getResponseEntity();
-
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
             dataFlowContext.setResponseEntity(responseEntity);
         }
     }
-
-
 }