组织机构修改

crmeb-admin/src/main/java/com/zbkj/admin/controller/merchant/NewMerchantApi.java

@@ -383,7 +383,7 @@ public class NewMerchantApi {
         String phone = merchantSmsTiming.getPhone();
         String tempId = merchantSmsTiming.getTempId();
         MerchantSms merchantSms = onePassSmsService.sendSSM(phone, Integer.valueOf(tempId));
-        if (null!=merchantSms) {
+        if (null != merchantSms) {
             return CommonResult.success(merchantSms);
         }
         return CommonResult.failed("请求错误可能是发送次数不够");
@@ -451,11 +451,11 @@ public class NewMerchantApi {
 
     @ApiOperation(value = "获取未发送手机号根据登录merId")
     @RequestMapping(value = "/getPhoneList", method = RequestMethod.GET)
-    public CommonResult<CommonPage<User>> getPhoneList(@RequestParam(value = "isMessage") String isMessage,
+    public CommonResult<CommonPage<User>> getPhoneList(@RequestParam(value = "id") String id,
                                                        @ModelAttribute PageParamRequest pageParamRequest) {
         SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser();
 
-        PageInfo<User> userPageInfo = orderService.getPhoneList(systemAdmin.getMerId(),pageParamRequest);
+        PageInfo<User> userPageInfo = orderService.getPhoneList(systemAdmin.getMerId(), pageParamRequest,id);
 
         CommonPage<User> userCommonPage = CommonPage.restPage(userPageInfo);
         return CommonResult.success(userCommonPage);
@@ -467,8 +467,8 @@ public class NewMerchantApi {
                                           @Validated PageParamRequest pageParamRequest) {
         SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser();
         LambdaQueryWrapper<TaskMessage> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TaskMessage::getMerId,systemAdmin.getMerId());
-        queryWrapper.eq(TaskMessage::getIsMessage,"1");
+        queryWrapper.eq(TaskMessage::getMerId, systemAdmin.getMerId());
+        queryWrapper.eq(TaskMessage::getIsMessage, "1");
         Page<TaskMessage> page = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
         List<TaskMessage> list = taskMessageService.list(queryWrapper);
         return CommonResult.success(CommonPage.restPage(CommonPage.copyPageInfo(page, list)));
@@ -481,10 +481,7 @@ public class NewMerchantApi {
         SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser();
         userService.savePhone(user, systemAdmin);
         return CommonResult.success("操作成功");
-
     }
 
 
-
-
 }

crmeb-admin/src/main/java/com/zbkj/admin/controller/platform/NewPlatformApi.java

@@ -504,11 +504,11 @@ public class NewPlatformApi {
         for (OrganizationVO organizationVO : list) {
             String id = organizationVO.getId();
             List<OrganizationDepartmentVO> organizationDepartments = organizationDepartmentService.selectMain(id);
-            organizationVO.setDepartment(organizationDepartments);
+            organizationVO.setChildren(organizationDepartments);
             for (OrganizationDepartmentVO organizationDepartment : organizationDepartments) {
                 String departmentId = organizationDepartment.getId();
                 List<OrganizationDepartmentUser> organizationDepartmentUsers = organizationDepartmentUserService.selectMainBydepartmentId(departmentId);
-                organizationDepartment.setOrganizationUser(organizationDepartmentUsers);
+                organizationDepartment.setChildren(organizationDepartmentUsers);
             }
         }
         return CommonResult.success(CommonPage.restPage(CommonPage.copyPageInfo(page, list)));

crmeb-common/src/main/java/com/zbkj/common/model/organization/Organization.java

@@ -51,10 +51,16 @@ public class Organization implements Serializable {
     private String sysOrgCode;
     /**企业名称*/
     @ApiModelProperty(value = "企业名称")
-    private String companyName;
+    private String name;
     /**企业编码*/
     @ApiModelProperty(value = "企业编码")
     private String companyCode;
+    /**企业名称*/
+    @ApiModelProperty(value = "联系人")
+    private String contacts;
+    /**企业编码*/
+    @ApiModelProperty(value = "联系方式")
+    private String phone;
 
 
 

crmeb-common/src/main/java/com/zbkj/common/model/organization/OrganizationDepartment.java

@@ -51,7 +51,7 @@ public class OrganizationDepartment implements Serializable {
     private String sysOrgCode;
     /**部门名称*/
     @ApiModelProperty(value = "部门名称")
-    private String departmentName;
+    private String name;
     /**部门编码*/
     @ApiModelProperty(value = "部门编码")
     private String departmentCode;

crmeb-common/src/main/java/com/zbkj/common/model/organization/OrganizationDepartmentUser.java

@@ -50,7 +50,7 @@ public class OrganizationDepartmentUser implements Serializable {
     private String sysOrgCode;
     /**用户名称*/
     @ApiModelProperty(value = "用户名称")
-    private String userName;
+    private String name;
     /**用户id*/
     @ApiModelProperty(value = "用户id")
     private String userId;

crmeb-common/src/main/java/com/zbkj/common/model/organization/VO/OrganizationDepartmentVO.java

@@ -51,7 +51,7 @@ public class OrganizationDepartmentVO implements Serializable {
     private String sysOrgCode;
     /**部门名称*/
     @ApiModelProperty(value = "部门名称")
-    private String departmentName;
+    private String name;
     /**部门编码*/
     @ApiModelProperty(value = "部门编码")
     private String departmentCode;
@@ -62,6 +62,6 @@ public class OrganizationDepartmentVO implements Serializable {
 
     /**用户*/
     @ApiModelProperty(value = "用户")
-    private List<OrganizationDepartmentUser> organizationUser;
+    private List<OrganizationDepartmentUser> children;
 
 }

crmeb-common/src/main/java/com/zbkj/common/model/organization/VO/OrganizationVO.java

@@ -50,14 +50,21 @@ public class OrganizationVO implements Serializable {
     private String sysOrgCode;
     /**企业名称*/
     @ApiModelProperty(value = "企业名称")
-    private String companyName;
+    private String name;
     /**企业编码*/
     @ApiModelProperty(value = "企业编码")
     private String companyCode;
 
+    /**企业名称*/
+    @ApiModelProperty(value = "联系人")
+    private String contacts;
+    /**企业编码*/
+    @ApiModelProperty(value = "联系方式")
+    private String phone;
+
     /**部门*/
     @ApiModelProperty(value = "部门")
-    private List<OrganizationDepartmentVO> department;
+    private List<OrganizationDepartmentVO> children;
 
 
 }

crmeb-service/src/main/java/com/zbkj/service/service/OrderService.java

@@ -277,5 +277,5 @@ public interface OrderService extends IService<Order> {
 
     List<Integer> getOrderUid();
 
-    PageInfo<User> getPhoneList(Integer merId,PageParamRequest pageParamRequest);
+    PageInfo<User> getPhoneList(Integer merId,PageParamRequest pageParamRequest,String id);
 }

crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java

@@ -1065,7 +1065,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
     }
 
     @Override
-    public PageInfo<User> getPhoneList(Integer merId, PageParamRequest pageParamRequest) {
+    public PageInfo<User> getPhoneList(Integer merId, PageParamRequest pageParamRequest,String id) {
         Page<Order> orderPage = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
 
         List<Integer> orderUid = orderDao.getPhoneList(merId);

crmeb-service/src/main/java/com/zbkj/service/service/impl/OrganizationServiceImpl.java

@@ -51,7 +51,7 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationDao, Organi
         organizationDao.insert(organization);
 
 
-        List<OrganizationDepartmentVO> department = request.getDepartment();
+        List<OrganizationDepartmentVO> department = request.getChildren();
         for (OrganizationDepartmentVO organizationDepartmentVO : department) {
             organizationDepartmentVO.setId(UUID.randomUUID().toString().replace("-", ""));
             organizationDepartmentVO.setCreateTime(new Date());
@@ -64,7 +64,7 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationDao, Organi
             organizationDeparementDao.insert(organizationDepartment);
 
 
-            List<OrganizationDepartmentUser> organizationUser = organizationDepartmentVO.getOrganizationUser();
+            List<OrganizationDepartmentUser> organizationUser = organizationDepartmentVO.getChildren();
             for (OrganizationDepartmentUser organizationDepartmentUser : organizationUser) {
                 organizationDepartmentUser.setId(UUID.randomUUID().toString().replace("-", ""));
                 organizationDepartmentUser.setCreateTime(new Date());
@@ -91,7 +91,7 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationDao, Organi
         this.updateById(organization);
 
 
-        List<OrganizationDepartmentVO> department = request.getDepartment();
+        List<OrganizationDepartmentVO> department = request.getChildren();
         for (OrganizationDepartmentVO departmentVO : department) {
             organizationDepartmentService.removeById(departmentVO.getId());
             OrganizationDepartment organizationDepartment = new OrganizationDepartment();
@@ -99,7 +99,7 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationDao, Organi
             organizationDepartment.setOrganizationId(id);
             organizationDeparementDao.insert(organizationDepartment);
 
-            List<OrganizationDepartmentUser> organizationUser = departmentVO.getOrganizationUser();
+            List<OrganizationDepartmentUser> organizationUser = departmentVO.getChildren();
             for (OrganizationDepartmentUser departmentUser : organizationUser) {
                 organizationDepartmentUserService.removeById(departmentUser.getId());
                 OrganizationDepartmentUser organizationDepartmentUser = new OrganizationDepartmentUser();
@@ -151,11 +151,11 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationDao, Organi
         OrganizationVO organizationVO = new OrganizationVO();
         BeanUtils.copyProperties(organization, organizationVO);
         List<OrganizationDepartmentVO> organizationDepartmentVOS = organizationDeparementDao.selectMain(id);
-        organizationVO.setDepartment(organizationDepartmentVOS);
+        organizationVO.setChildren(organizationDepartmentVOS);
         for (OrganizationDepartmentVO departmentVO : organizationDepartmentVOS) {
             String departmentVOId = departmentVO.getId();
             List<OrganizationDepartmentUser> organizationDepartmentUsers = organizationDeparementUserDao.selectMainBydepartmentId(departmentVOId);
-            departmentVO.setOrganizationUser(organizationDepartmentUsers);
+            departmentVO.setChildren(organizationDepartmentUsers);
         }
         return organizationVO;
     }