user/role/tright 6.14

src/main/java/com/pangding/web/authority/dao/AuthorityDao.java

@@ -2,6 +2,7 @@ package com.pangding.web.authority.dao;
 
 import com.pangding.web.authority.vo.AuthorityVo;
 import com.pangding.web.authority.vo.reqvo.AuthorityAfterReqVo;
+import com.pangding.web.authority.vo.reqvo.AuthorityGetReqVo;
 import com.pangding.web.authority.vo.reqvo.AuthorityListReqVo;
 import com.pangding.web.authority.vo.reqvo.ListAuthorityByPageReqVo;
 import com.yanzuoguang.dao.BaseDao;
@@ -33,4 +34,5 @@ public interface AuthorityDao extends BaseDao {
 
     List<AuthorityVo> after(AuthorityAfterReqVo afterReqVo);
 
+    List<AuthorityVo> listBySort(AuthorityGetReqVo reqVo);
 }

src/main/java/com/pangding/web/authority/dao/CompanyBankCardDao.java

@@ -23,4 +23,6 @@ public interface CompanyBankCardDao extends BaseDao {
      * @param setNotDefaultReqVo 设置非默认的请求对象
      */
     void setNotDefault(CompanyBankCardSetNotDefaultReqVo setNotDefaultReqVo);
+
+    void checkBankCardCode(CompanyBankCardVo checkReqVo);
 }

src/main/java/com/pangding/web/authority/dao/UserDao.java

@@ -56,7 +56,7 @@ public interface UserDao extends BaseDao {
      */
     PageSizeData<UserVo> getUserVoList(ListUserReqVo reqVo);
 
-    UserVo getSuperAdmin(UserGetSuperAdminReqVo reqVo);
+    UserVo getAdmin(UserGetSuperAdminReqVo reqVo);
 
     /**
      * 获取该公司该角色已分配的角色列表

src/main/java/com/pangding/web/authority/dao/impl/AuthorityDaoImpl.java

@@ -3,6 +3,7 @@ package com.pangding.web.authority.dao.impl;
 import com.pangding.web.authority.dao.AuthorityDao;
 import com.pangding.web.authority.vo.AuthorityVo;
 import com.pangding.web.authority.vo.reqvo.AuthorityAfterReqVo;
+import com.pangding.web.authority.vo.reqvo.AuthorityGetReqVo;
 import com.pangding.web.authority.vo.reqvo.AuthorityListReqVo;
 import com.pangding.web.authority.vo.reqvo.ListAuthorityByPageReqVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
@@ -21,6 +22,7 @@ public class AuthorityDaoImpl extends BaseDaoImpl implements AuthorityDao {
     private static final String SELECT = "SELECT";
     private static final String GET_LEVEL_ONE = "GET_LEVEL_ONE";
     private static final String AFTER = "AFTER";
+    private static final String LIST_BY_SORT = "LIST_BY_SORT";
 
     @Override
     protected void init() {
@@ -35,11 +37,14 @@ public class AuthorityDaoImpl extends BaseDaoImpl implements AuthorityDao {
                 .add("levelOne","and pid = '' ");
 
         table.add(GET_LEVEL_ONE,"select * from pd_authority where 1=1 ")
-                .add("levelOne","and pid = '' ");
+                .add("levelOne","and pid = '' order by sort asc");
 
         table.add(AFTER,"select * from pd_authority where 1=1 ")
                 .add("pid","and pid = ? ")
                 .add("sort","and sort >= ? ");
+
+        table.add(LIST_BY_SORT,"select * from pd_authority where 1=1 ")
+                .add("pid","and pid = ? order by sort asc");
     }
 
     /**
@@ -72,4 +77,9 @@ public class AuthorityDaoImpl extends BaseDaoImpl implements AuthorityDao {
     public List<AuthorityVo> after(AuthorityAfterReqVo afterReqVo) {
         return this.query(AuthorityVo.class,AFTER,afterReqVo);
     }
+
+    @Override
+    public List<AuthorityVo> listBySort(AuthorityGetReqVo reqVo) {
+        return this.query(AuthorityVo.class,LIST_BY_SORT,reqVo);
+    }
 }

src/main/java/com/pangding/web/authority/dao/impl/CompanyBankCardDaoImpl.java

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Component;
 public class CompanyBankCardDaoImpl extends BaseDaoImpl implements CompanyBankCardDao {
     private static final String GET_BANK_CARD_LIST = "GET_BANK_CARD_LIST";
     private static final String SET_NOT_DEFAULT = "SET_NOT_DEFAULT";
+    private static final String CHECK_BANK_CARD_CODE = "CHECK_BANK_CARD_CODE";
 
     @Override
     protected void init() {
@@ -27,6 +28,8 @@ public class CompanyBankCardDaoImpl extends BaseDaoImpl implements CompanyBankCa
         table.add(SET_NOT_DEFAULT,"update pd_company_bank_card a set a.is_default = 0 where 1=1 ")
                 .add("id","and id = ?")
                 .add("companyId","and company_id = ?");
+
+        table.addExist(CHECK_BANK_CARD_CODE,"bank_card_code");
     }
 
     /**
@@ -43,4 +46,9 @@ public class CompanyBankCardDaoImpl extends BaseDaoImpl implements CompanyBankCa
     public void setNotDefault(CompanyBankCardSetNotDefaultReqVo setNotDefaultReqVo) {
         this.updateSql(SET_NOT_DEFAULT,setNotDefaultReqVo);
     }
+
+    @Override
+    public void checkBankCardCode(CompanyBankCardVo checkReqVo) {
+        this.checkExist(CHECK_BANK_CARD_CODE,checkReqVo,"该银行卡号已存在");
+    }
 }

src/main/java/com/pangding/web/authority/dao/impl/UserDaoImpl.java

@@ -22,7 +22,7 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
     private static final String SELECT = "SELECT";
     private static final String CHECK_ACCOUNT = "CHECK_ACCOUNT";
     private static final String CHECK_PHONE = "CHECK_PHONE";
-    private static final String GET_SUPER_ADMIN = "GET_SUPER_ADMIN";
+    private static final String GET_ADMIN = "GET_ADMIN";
     private static final String COUNT_BY_ROLE = "COUNT_BY_ROLE";
 
     @Override
@@ -35,7 +35,7 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
 
         table.addExist(CHECK_PHONE,"phone");
 
-        table.add(GET_SUPER_ADMIN,"SELECT u.* FROM pd_user u,pd_user_role ur WHERE u.id = ur.user_id")
+        table.add(GET_ADMIN,"SELECT u.* FROM pd_user u,pd_user_role ur WHERE u.id = ur.user_id")
                 .add("superAdminRoleId","and ur.role_id = ?")
                 .add("companyId","and u.company_id = ? ");
 
@@ -72,8 +72,8 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
     }
 
     @Override
-    public UserVo getSuperAdmin(UserGetSuperAdminReqVo reqVo) {
-        return this.queryFirst(UserVo.class,GET_SUPER_ADMIN,reqVo);
+    public UserVo getAdmin(UserGetSuperAdminReqVo reqVo) {
+        return this.queryFirst(UserVo.class,GET_ADMIN,reqVo);
     }
 
     @Override

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

 package com.pangding.web.authority.service;
 
-import com.pangding.web.authority.vo.reqvo.SaveDataReqVo;
 import com.pangding.web.authority.vo.resvo.FindResVo;
 
-import java.util.List;
 
 /**
  * @Author zhangjinyao

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

@@ -265,7 +265,7 @@ public class AuthorityServiceImpl implements AuthorityService {
     private List<AuthorityListByLevelResVo> getChildList(String id){
         AuthorityGetReqVo reqVo = new AuthorityGetReqVo();
         reqVo.setPid(id);
-        List<AuthorityVo> childList = authorityDao.loadList(reqVo,AuthorityVo.class);
+        List<AuthorityVo> childList = authorityDao.listBySort(reqVo);
         List<AuthorityListByLevelResVo> childResList = new ArrayList();
         if (null != childList && !childList.isEmpty()){
             for (AuthorityVo authorityVo:childList) {
@@ -283,8 +283,8 @@ public class AuthorityServiceImpl implements AuthorityService {
     public List<AuthorityListByLevelResVo> getCompanyAuthority(CompanyAuthorityReqVo reqVo) {
         UserGetSuperAdminReqVo userGetSuperAdminReqVo = new UserGetSuperAdminReqVo();
         userGetSuperAdminReqVo.setCompanyId(reqVo.getCompanyId());
-        userGetSuperAdminReqVo.setSuperAdminRoleId(RoleConstant.SUPER_ADMIN_ROLE_ID);
-        UserVo superAdmin = userDaoImpl.getSuperAdmin(userGetSuperAdminReqVo);
+        userGetSuperAdminReqVo.setAdminRoleId(RoleConstant.SUPER_ADMIN_ROLE_ID);
+        UserVo superAdmin = userDaoImpl.getAdmin(userGetSuperAdminReqVo);
         if (null == superAdmin){
             throw new CodeException("暂无超级管理员");
         }

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

@@ -89,8 +89,8 @@ public class CompanyServiceImpl implements CompanyService{
         /*获取用户表信息*/
         UserGetSuperAdminReqVo req = new UserGetSuperAdminReqVo();
         req.setCompanyId(reqVo.getId());
-        req.setSuperAdminRoleId(RoleConstant.SUPER_ADMIN_ROLE_ID);
-        UserVo userVo = userDaoImpl.getSuperAdmin(req);
+        req.setAdminRoleId(RoleConstant.ADMIN_ROLE_ID);
+        UserVo userVo = userDaoImpl.getAdmin(req);
         if (null != userVo){
             resVo.setUserVo(userVo);
         }
@@ -418,6 +418,12 @@ public class CompanyServiceImpl implements CompanyService{
         /*若该卡存在，则修改*/
         CompanyBankCardGetReqVo getReqVo = new CompanyBankCardGetReqVo();
         if (null != reqVo.getId() && !"".equals(reqVo.getId())){
+            /*检查银行卡号是否存在*/
+            CompanyBankCardVo checkReqVo = new CompanyBankCardVo();
+            checkReqVo.setId(reqVo.getId());
+            checkReqVo.setBankCardCode(reqVo.getBankCardCode());
+            companyBankCardDao.checkBankCardCode(checkReqVo);
+
             getReqVo.setId(reqVo.getId());
             CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(getReqVo,CompanyBankCardVo.class);
             if (null != companyBankCardVo){
@@ -430,6 +436,11 @@ public class CompanyServiceImpl implements CompanyService{
         }
         /*若卡不存在，则新增*/
         else{
+            /*检查银行卡号是否存在*/
+            CompanyBankCardVo checkReqVo = new CompanyBankCardVo();
+            checkReqVo.setBankCardCode(reqVo.getBankCardCode());
+            companyBankCardDao.checkBankCardCode(checkReqVo);
+
             reqVo.setId(id);
             BankCardListReqVo reqVo1 = new BankCardListReqVo();
             PageSizeData<CompanyBankCardVo> companyBankCardDaoBankCardList = companyBankCardDao.getBankCardList(reqVo1);
@@ -437,6 +448,8 @@ public class CompanyServiceImpl implements CompanyService{
             /*若该银行卡是第一张银行卡，则设为默认*/
             if (null == companyBankCardDaoBankCardList || companyBankCardDaoBankCardList.getList().isEmpty()){
                 reqVo.setIsDefault(CompanyBankCardConstant.IS_DEFAULT);
+            }else{
+                reqVo.setIsDefault(CompanyBankCardConstant.IS_NOT_DEFAULT);
             }
             reqVo.setStatus(0);
             companyBankCardDao.create(reqVo);

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

 package com.pangding.web.authority.service.impl;
 
-import com.pangding.web.authority.dao.CompanyBankCardDao;
-import com.pangding.web.authority.dao.CompanyDao;
-import com.pangding.web.authority.dao.CompanyExtendDao;
-import com.pangding.web.authority.dao.UserDao;
+import com.pangding.web.authority.dao.*;
 import com.pangding.web.authority.feign.DataFeign;
 import com.pangding.web.authority.service.DataService;
+import com.pangding.web.authority.util.CompanyConstant;
+import com.pangding.web.authority.util.RoleConstant;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.FindResVo;
@@ -35,6 +34,8 @@ public class DataServiceImpl implements DataService {
     private CompanyExtendDao companyExtendDaoImpl;
     @Autowired
     private CompanyBankCardDao companyBankCardDaoImpl;
+    @Autowired
+    private UserRoleDao userRoleDaoImpl;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -66,6 +67,7 @@ public class DataServiceImpl implements DataService {
         companyVo.setCreateTime(tyyCompanyVo.getCreateTime());
         companyVo.setExamineStatus(Integer.parseInt(enterpriseVo.getExamine()));
         companyVo.setCompanyAttribute(Integer.parseInt(enterpriseVo.getUsertype()));
+        companyVo.setProductOrInterface(CompanyConstant.PRODUCT);
         if (null != tyyCompanyExtendVo ){
             companyVo.setElectromicAgreementCode(tyyCompanyExtendVo.getCode());
             companyVo.setSigningStatus(tyyCompanyExtendVo.getStatus());
@@ -75,6 +77,8 @@ public class DataServiceImpl implements DataService {
         CompanyVo companyVo1 = companyDaoImpl.load(companyGetReqVo,CompanyVo.class);
         if (null == companyVo1){
             companyDaoImpl.create(companyVo);
+        }else{
+            companyDaoImpl.update(companyVo);
         }
 
         /*保存用户表*/
@@ -93,6 +97,23 @@ public class DataServiceImpl implements DataService {
         UserVo userVo1 = userDaoImpl.load(userGetReqVo,UserVo.class);
         if (null == userVo1){
             userDaoImpl.create(userVo);
+            /*给用户分配管理员角色*/
+            UserRoleVo userRoleVo = new UserRoleVo();
+            userRoleVo.setUserId(userVo.getId());
+            userRoleVo.setRoleId(RoleConstant.ADMIN_ROLE_ID);
+            userRoleDaoImpl.create(userRoleVo);
+        }else{
+            userVo.setId(userVo1.getId());
+            userDaoImpl.update(userVo);
+            /*给用户分配管理员角色*/
+            UserRoleVo userRoleVo = new UserRoleVo();
+            userRoleVo.setUserId(userVo1.getId());
+            userRoleVo.setRoleId(RoleConstant.ADMIN_ROLE_ID);
+            UserRoleVo userRoleVo1 = userRoleDaoImpl.load(userRoleVo,UserRoleVo.class);
+            if (null == userRoleVo1){
+                userRoleVo.setId(StringHelper.getNewID());
+                userRoleDaoImpl.create(userRoleVo);
+            }
         }
 
         /*保存公司扩展表*/
@@ -110,9 +131,12 @@ public class DataServiceImpl implements DataService {
         CompanyExtendVo companyExtendVo1 = companyExtendDaoImpl.load(companyExtendGetReqVo,CompanyExtendVo.class);
         if (null == companyExtendVo1){
             companyExtendDaoImpl.create(companyExtendVo);
+        }else{
+            companyExtendDaoImpl.update(companyExtendVo);
         }
 
         /*保存银行卡表*/
+        Boolean flag = true;
         for (EnterpriseBankVo enterpriseBankVo:enterpriseBankVoList) {
             CompanyBankCardVo companyBankCardVo = new CompanyBankCardVo();
             companyBankCardVo.setId(enterpriseBankVo.getId());
@@ -128,11 +152,17 @@ public class DataServiceImpl implements DataService {
             companyBankCardVo.setStatus(enterpriseBankVo.getBankStatus());
             companyBankCardVo.setBindingCode(enterpriseBankVo.getBindId());
             companyBankCardVo.setBindingTime(enterpriseBankVo.getBindDate());
+            if (flag){
+                companyBankCardVo.setIsDefault("1");
+                flag = false;
+            }
             CompanyBankCardGetReqVo companyBankCardGetReqVo = new CompanyBankCardGetReqVo();
             companyBankCardGetReqVo.setId(companyBankCardVo.getId());
             CompanyBankCardVo companyBankCardVo1 = companyBankCardDaoImpl.load(companyBankCardGetReqVo,CompanyBankCardVo.class);
             if (null == companyBankCardVo1){
                 companyBankCardDaoImpl.create(companyBankCardVo);
+            }else{
+                companyBankCardDaoImpl.update(companyBankCardVo);
             }
         }
     }

src/main/java/com/pangding/web/authority/util/RoleConstant.java

@@ -10,4 +10,6 @@ public class RoleConstant {
      * 超级管理员角色id
      */
     public static final String SUPER_ADMIN_ROLE_ID = "z001559267717678b813b7a85db4521f";
+
+    public static final String ADMIN_ROLE_ID = "z0015604817387d5bcf3437fce751234";
 }

src/main/java/com/pangding/web/authority/vo/CompanyBankCardVo.java

@@ -25,7 +25,7 @@ public class CompanyBankCardVo extends BaseVo {
     @TableAnnotation("bank_code")
     private String bankCode;
 
-    private int type;
+    private Integer type;
 
     @TableAnnotation("company_id")
     private String companyId;
@@ -38,7 +38,7 @@ public class CompanyBankCardVo extends BaseVo {
     @TableAnnotation("reserved_phone")
     private String phone;
 
-    private int status;
+    private Integer status;
 
     @TableAnnotation("binding_code")
     private String bindingCode;
@@ -105,11 +105,11 @@ public class CompanyBankCardVo extends BaseVo {
         this.bankCode = bankCode;
     }
 
-    public int getType() {
+    public Integer getType() {
         return type;
     }
 
-    public void setType(int type) {
+    public void setType(Integer type) {
         this.type = type;
     }
 
@@ -139,11 +139,11 @@ public class CompanyBankCardVo extends BaseVo {
 
 
 
-    public int getStatus() {
+    public Integer getStatus() {
         return status;
     }
 
-    public void setStatus(int status) {
+    public void setStatus(Integer status) {
         this.status = status;
     }
 

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

@@ -7,7 +7,7 @@ package com.pangding.web.authority.vo.reqvo;
 public class UserGetSuperAdminReqVo {
     private String companyId;
 
-    private String superAdminRoleId;
+    private String adminRoleId;
 
     public String getCompanyId() {
         return companyId;
@@ -17,11 +17,11 @@ public class UserGetSuperAdminReqVo {
         this.companyId = companyId;
     }
 
-    public String getSuperAdminRoleId() {
-        return superAdminRoleId;
+    public String getAdminRoleId() {
+        return adminRoleId;
     }
 
-    public void setSuperAdminRoleId(String superAdminRoleId) {
-        this.superAdminRoleId = superAdminRoleId;
+    public void setAdminRoleId(String adminRoleId) {
+        this.adminRoleId = adminRoleId;
     }
 }