1

src/main/java/com/pangding/web/authority/controller/RoleController.java

@@ -3,6 +3,7 @@ package com.pangding.web.authority.controller;
 
 import com.pangding.web.authority.vo.RoleVo;
 import com.pangding.web.authority.vo.UserVo;
+import com.pangding.web.authority.vo.reqvo.AddReqVo;
 import com.pangding.web.authority.vo.reqvo.CountByRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.WebRoleReqVo;
@@ -111,4 +112,19 @@ public class RoleController {
         roleServiceImpl.delete(webRoleReqVo);
         return new ResponseResult();
     }
+
+    /**
+     * 给指定角色添加权限
+     * @param reqVo
+     * @return
+     */
+    @RequestMapping(value = "/add",method = RequestMethod.POST,produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public ResponseResult add(@RequestBody AddReqVo reqVo){
+        CheckerHelper.newInstance()
+                .notBlankCheck("roleId",reqVo.getRoleId())
+                .notBlankCheck("authorityId",reqVo.getAuthorityId())
+                .checkException();
+        roleServiceImpl.add(reqVo);
+        return new ResponseResult();
+    }
 }

src/main/java/com/pangding/web/authority/service/RoleService.java

@@ -2,6 +2,7 @@ package com.pangding.web.authority.service;
 
 import com.pangding.web.authority.vo.AuthorityVo;
 import com.pangding.web.authority.vo.UserVo;
+import com.pangding.web.authority.vo.reqvo.AddReqVo;
 import com.pangding.web.authority.vo.reqvo.CountByRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.WebRoleReqVo;
@@ -108,4 +109,5 @@ public interface RoleService {
      */
     PageSizeData<UserVo> countByRole(CountByRoleReqVo reqVo);
 
+    void add(AddReqVo reqVo);
 }

src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java

@@ -134,14 +134,6 @@ public class CompanyServiceImpl implements CompanyService {
             resVo.setCompanyVo(companyVo);
         }
 
-         /*获取公司扩展表信息*/
-        CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
-        companyExtendGetReqVo.setId(reqVo.getId());
-        CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyExtendGetReqVo, CompanyExtendVo.class);
-        if (null != companyExtendVo) {
-            resVo.setCompanyExtendVo(companyExtendVo);
-        }
-
         /*此处需要根据公司id和productOrInterface获取商户信息*/
         CompanyScenicInfoReqVo companyScenicInfoReqVo = new CompanyScenicInfoReqVo();
         companyScenicInfoReqVo.setCompanyId(companyVo.getId());
@@ -156,7 +148,13 @@ public class CompanyServiceImpl implements CompanyService {
             resVo.setMerchant(null);
         }
 
-
+        /*获取公司扩展表信息*/
+        CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
+        companyExtendGetReqVo.setId(reqVo.getId());
+        CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyExtendGetReqVo, CompanyExtendVo.class);
+        if (null != companyExtendVo) {
+            resVo.setCompanyExtendVo(companyExtendVo);
+        }
         /*获取公司银行卡列表*/
         CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
         companyBankCardGetReqVo.setCompanyId(reqVo.getId());
@@ -180,7 +178,7 @@ public class CompanyServiceImpl implements CompanyService {
         /*返回结果对象*/
         SaveCompanyResVo resVo = new SaveCompanyResVo();
         /*检查用户名*/
-        if (null != reqVo.getAccount()){
+        if (!StringHelper.isEmpty(reqVo.getAccount())){
             userServiceImpl.isValid(reqVo.getAccount());
             UserVo userReqVo = new UserVo();
             userReqVo.setAccount(reqVo.getAccount());
@@ -209,7 +207,7 @@ public class CompanyServiceImpl implements CompanyService {
         if (reqVo.getCompanyType() == 1) {
             CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
             ObjectHelper.writeWithFrom(companyBankCardVo, reqVo);
-            companyBankCardVo.setId(reqVo.getCompanyBankCardId()!= null?reqVo.getCompanyBankCardId():StringHelper.getNewID());
+            companyBankCardVo.setId(!StringHelper.isEmpty(reqVo.getCompanyBankCardId())?reqVo.getCompanyBankCardId():StringHelper.getNewID());
             companyBankCardVo.setName(reqVo.getContactName());
             companyBankCardVo.setPhone(reqVo.getContactPhone());
             companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
@@ -234,7 +232,7 @@ public class CompanyServiceImpl implements CompanyService {
         companyVo1.setCompanyAttribute(companyReqVo.getCompanyAttribution());
 
         /*保存公司主表*/
-        if (reqVo.getCompanyId()!=null){
+        if (!StringHelper.isEmpty(reqVo.getCompanyId())){
             companyDao.update(companyVo1);
         }else {
             companyDao.create(companyVo1);
@@ -251,7 +249,7 @@ public class CompanyServiceImpl implements CompanyService {
             ObjectHelper.writeWithFrom(companyBankCardVo, companyBankReqVo);
             companyBankCardVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
 
-            if (null != reqVo.getCompanyBankCardId()){
+            if (!StringHelper.isEmpty(reqVo.getCompanyBankCardId())){
                 companyBankCardDao.update(companyBankCardVo);
             }else {
                 companyBankCardDao.create(companyBankCardVo);
@@ -268,7 +266,7 @@ public class CompanyServiceImpl implements CompanyService {
                 .replace(":", "")
                 .replace(" ", "");
         extendVo.setQrCode(qrCode);
-        if (null != reqVo.getCompanyExtendId()){
+        if (!StringHelper.isEmpty(reqVo.getCompanyExtendId())){
             companyExtendDaoImpl.update(extendVo);
         }else {
             companyExtendDaoImpl.create(extendVo);
@@ -296,19 +294,26 @@ public class CompanyServiceImpl implements CompanyService {
 
         /*保存用户*/
         UserVo userVo = new UserVo();
-        userVo.setId(reqVo.getUserId()!=null?reqVo.getUserId():StringHelper.getNewID());
-        userVo.setAccount(reqVo.getAccount());
+        if (StringHelper.isEmpty(reqVo.getUserId())){
+            userVo.setId(StringHelper.getNewID());
             userVo.setPassword(StringHelper.md5("123456"));
             userVo.setRemark("123456");
-        userVo.setName(reqVo.getContactName());
             userVo.setCreateId(reqVo.getCreateId());
             userVo.setCreateName(reqVo.getCreateName());
             userVo.setCompanyId(companyVo.getId());
-        userVo.setPhone(reqVo.getContactPhone());
             userVo.setIsFirst(1);
+        }else{
+            UserGetReqVo userGetReqVo = new UserGetReqVo();
+            userGetReqVo.setId(reqVo.getUserId());
+            userVo = userDaoImpl.load(userGetReqVo,UserVo.class);
+        }
+        userVo.setAccount(reqVo.getAccount());
+        userVo.setName(reqVo.getContactName());
+        userVo.setPhone(reqVo.getContactPhone());
+
         /*检查手机是否存在*/
-        userServiceImpl.checkPhone(userVo);
-        if (null!=reqVo.getUserId()){
+        /*userServiceImpl.checkPhone(userVo);*/
+        if (!StringHelper.isEmpty(reqVo.getUserId())){
             userDaoImpl.update(userVo);
         }else {
             userDaoImpl.create(userVo);
@@ -431,7 +436,7 @@ public class CompanyServiceImpl implements CompanyService {
         userVo.setAccount(reqVo.getAccount());
         userVo.setName(reqVo.getContactName());
         userVo.setPhone(reqVo.getContactPhone());
-        userServiceImpl.checkPhone(userVo);
+        /*userServiceImpl.checkPhone(userVo);*/
         userDaoImpl.update(userVo);
 
         resVo.setUserId(userVo.getId());
@@ -501,6 +506,7 @@ public class CompanyServiceImpl implements CompanyService {
 
             reqVo.setId(id);
             BankCardListReqVo reqVo1 = new BankCardListReqVo();
+            reqVo1.setCompanyId(reqVo.getCompanyId());
             PageSizeData<CompanyBankCardVo> companyBankCardDaoBankCardList = companyBankCardDao.getBankCardList(reqVo1);
 
             /*若该银行卡是第一张银行卡，则设为默认*/

src/main/java/com/pangding/web/authority/service/impl/RoleServiceImpl.java

@@ -310,4 +310,12 @@ public class RoleServiceImpl implements RoleService {
     public PageSizeData<UserVo> countByRole(CountByRoleReqVo reqVo) {
         return userDaoImpl.countByRole(reqVo);
     }
+
+    @Override
+    public void add(AddReqVo reqVo) {
+        RoleAuthorityVo roleAuthorityVo = new RoleAuthorityVo();
+        ObjectHelper.writeWithFrom(roleAuthorityVo,reqVo);
+        roleAuthorityVo.setId(StringHelper.getNewID());
+        roleAuthorityDaoImpl.create(roleAuthorityVo);
+    }
 }

src/main/java/com/pangding/web/authority/service/impl/UserServiceImpl.java

@@ -148,8 +148,8 @@ public class UserServiceImpl implements UserService {
         UserGetReqVo userGetReqVo = new UserGetReqVo();
         userGetReqVo.setPhone(userVo.getPhone());
         UserVo userVo1 = userDao.load(userGetReqVo,UserVo.class);
-        if ((null != userVo1 && null == userVo.getId()) ||
-                (null != userVo1 && null != userVo.getId() && !userVo1.getId().equals(userVo.getId()))){
+        if ((!StringHelper.isEmpty(userVo1) && StringHelper.isEmpty(userVo.getId())) ||
+                (!StringHelper.isEmpty(userVo1) && !StringHelper.isEmpty(userVo.getId()) && !userVo1.getId().equals(userVo.getId()))){
             throw new CodeException("手机号"+userVo.getPhone()+"已存在");
         }
     }

src/main/java/com/pangding/web/authority/vo/reqvo/AddReqVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/8/20 16:54
+ */
+public class AddReqVo {
+    private String reqId;
+
+    private String roleId;
+
+    private String authorityId;
+
+    public String getReqId() {
+        return reqId;
+    }
+
+    public void setReqId(String reqId) {
+        this.reqId = reqId;
+    }
+
+    public String getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(String roleId) {
+        this.roleId = roleId;
+    }
+
+    public String getAuthorityId() {
+        return authorityId;
+    }
+
+    public void setAuthorityId(String authorityId) {
+        this.authorityId = authorityId;
+    }
+}

src/main/java/com/pangding/web/authority/vo/reqvo/DataSynReqVo.java

+package com.pangding.web.authority.vo.reqvo;
+
+public class DataSynReqVo {
+}