修改权限管理查询逻辑

修改余额常量字段

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

 package com.pangding.web.authority.dao;
 
-import com.pangding.web.authority.vo.reqvo.RoleAuthorityGetReqVo;
-import com.pangding.web.authority.vo.RoleAuthorityVo;
 import com.yanzuoguang.dao.BaseDao;
 
-import java.util.List;
 
 /**
  * @author zhangjinyao

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

@@ -2,6 +2,7 @@ package com.pangding.web.authority.dao;
 
 import com.pangding.web.authority.vo.reqvo.UserRoleGetReqVo;
 import com.pangding.web.authority.vo.UserRoleVo;
+import com.pangding.web.authority.vo.resvo.WebRoleResVo;
 import com.yanzuoguang.dao.BaseDao;
 
 import java.util.List;
@@ -19,4 +20,6 @@ public interface UserRoleDao extends BaseDao {
      */
     List<UserRoleVo> getUserRoleList(UserRoleGetReqVo reqVo);
 
+    List<WebRoleResVo> getUserNum(UserRoleGetReqVo reqVo);
+
 }

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

@@ -3,6 +3,7 @@ package com.pangding.web.authority.dao.impl;
 import com.pangding.web.authority.dao.RoleAuthorityDao;
 import com.pangding.web.authority.vo.reqvo.RoleAuthorityGetReqVo;
 import com.pangding.web.authority.vo.RoleAuthorityVo;
+import com.yanzuoguang.dao.DaoConst;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Component;
 
@@ -16,9 +17,16 @@ public class RoleAuthorityDaoImpl extends BaseDaoImpl implements RoleAuthorityDa
 
     @Override
     protected void init() {
-
         register(RoleAuthorityVo.class);
 
+        getSql(DaoConst.LOAD).setSql("select ra.role_id,a.* from pd_authority a " +
+                "LEFT JOIN pd_role_authority ra on ra.authority_id = a.id {INNER} " +
+                "where 1=1 {WHERE} ORDER BY a.pid,a.sort" )
+                .add("userId", "AND b.user_id = @userId",
+                        "{INNER}", "INNER JOIN pd_user_role AS b ON ra.role_id = b.role_id")
+                .add("role", " AND ra.role_id = @role")
+        ;
+
     }
 
 }

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

@@ -3,6 +3,7 @@ package com.pangding.web.authority.dao.impl;
 import com.pangding.web.authority.dao.UserRoleDao;
 import com.pangding.web.authority.vo.reqvo.UserRoleGetReqVo;
 import com.pangding.web.authority.vo.UserRoleVo;
+import com.pangding.web.authority.vo.resvo.WebRoleResVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Component;
 
@@ -16,14 +17,20 @@ public class UserRoleDaoImpl extends BaseDaoImpl implements UserRoleDao {
 
     private static final String GET_USER_ROLE_LIST = "GET_USER_ROLE_LIST";
 
+    private static final String GET_ROLE_USER_NUMBER = "GET_ROLE_USER_NUMBER";
+
     @Override
     protected void init() {
 
         register(UserRoleVo.class);
 
         table.add(GET_USER_ROLE_LIST,"select * from pd_user_role where 1=1 ")
-                .add("userId","and user_id = ?")
-                .add("roleId","and role_id = ?");
+                .add("userId","and user_id = ? ")
+                .add("roleId","and role_id = ? ");
+
+        table.add(GET_ROLE_USER_NUMBER,"select count(*),role_id from pd_user_role where 1=1 {WHERE} group by role_id ")
+                .add("userId","and user_id = ? ")
+                .add("roleIds","and role_id in ? ");
 
     }
 
@@ -32,4 +39,9 @@ public class UserRoleDaoImpl extends BaseDaoImpl implements UserRoleDao {
         return this.query(UserRoleVo.class,GET_USER_ROLE_LIST,reqVo);
     }
 
+    @Override
+    public List<WebRoleResVo> getUserNum(UserRoleGetReqVo reqVo) {
+        return this.query(WebRoleResVo.class,GET_ROLE_USER_NUMBER,reqVo);
+    }
+
 }

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

@@ -13,6 +13,7 @@ import com.pangding.web.authority.util.RsaConstant;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.*;
+import com.pangding.web.constant.OrderConstant;
 import com.pangding.web.util.RSAUtils;
 import com.pangding.web.vo.system.req.company.CompanyMoneyDetailReqVo;
 import com.pangding.web.vo.system.req.company.CompanyMoneyUpdateReqVo;
@@ -977,14 +978,14 @@ public class CompanyServiceImpl implements CompanyService {
 //            req = new UpdateCompanyMoneyReqVo();
 //            req.setCompanyId(companyVo.getId());
 
-            if (CompanyConstant.MONEY_TYPE_FZ == req.getMoneyType()
-                    || CompanyConstant.MONEY_TYPE_ZZ == req.getMoneyType()
-                    || CompanyConstant.MONEY_TYPE_CZ == req.getMoneyType()) {
+            if (OrderConstant.CATEGORY_ENTRY == req.getMoneyType()
+                    || OrderConstant.CATEGORY_DIVIDEND == req.getMoneyType()
+                    || OrderConstant.CATEGORY_RECHARGE == req.getMoneyType()) {
                 // 分账 转账 充值
                 companyMoney += req.getMoney();
             }
-            if (CompanyConstant.MONEY_TYPE_REFUND == req.getMoneyType()
-                    || CompanyConstant.MONEY_TYPE_TX == req.getMoneyType()) {
+            if (OrderConstant.CATEGORY_REFUND == req.getMoneyType()
+                    || OrderConstant.CATEGORY_WITHDRAWAL == req.getMoneyType()) {
                 // 退款 提现
                 companyMoney -= req.getMoney();
             }

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

@@ -178,9 +178,10 @@ public class RoleServiceImpl implements RoleService {
         List<WebRoleResVo> webRoleResVoList = new ArrayList();
         for (RoleVo roleVo : roleVoList) {
             WebRoleResVo resVo = new WebRoleResVo();
-            List<AuthorityVo> authorityVoList = this.getAuthorityListByRoleId(roleVo.getId());
             ObjectHelper.writeWithFrom(resVo, roleVo);
-            resVo.setAuthorityList(authorityVoList);
+
+//            List<AuthorityVo> authorityVoList = this.getAuthorityListByRoleId(roleVo.getId());
+//            resVo.setAuthorityList(authorityVoList);
 
             CountByRoleReqVo countByRoleReqVo = new CountByRoleReqVo();
             countByRoleReqVo.setCompanyId(req.getCompanyId());
@@ -237,17 +238,17 @@ public class RoleServiceImpl implements RoleService {
     @Override
     public List<AuthorityVo> getAuthorityListByRoleId(String roleId) {
         RoleAuthorityGetReqVo reqVo = new RoleAuthorityGetReqVo();
-        reqVo.setRoleId(roleId);
-        List<RoleAuthorityVo> roleAuthorityRelationList = roleAuthorityDaoImpl.loadList(reqVo, RoleAuthorityVo.class);
+        reqVo.setRole(roleId);
+        List<AuthorityVo> roleAuthorityRelationList = roleAuthorityDaoImpl.loadList(reqVo, AuthorityVo.class);
         if (roleAuthorityRelationList != null && !roleAuthorityRelationList.isEmpty()) {
-            List<AuthorityVo> authorityList = new ArrayList(roleAuthorityRelationList.size());
-            for (RoleAuthorityVo roleAuthorityRelation : roleAuthorityRelationList) {
-                AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
-                authorityGetReqVo.setId(roleAuthorityRelation.getAuthorityId());
-                AuthorityVo authorityVo = authorityDaoImpl.load(authorityGetReqVo, AuthorityVo.class);
-                authorityList.add(authorityVo);
-            }
-            return authorityList;
+//            List<AuthorityVo> authorityList = new ArrayList(roleAuthorityRelationList.size());
+//            for (RoleAuthorityVo roleAuthorityRelation : roleAuthorityRelationList) {
+//                AuthorityGetReqVo authorityGetReqVo = new AuthorityGetReqVo();
+//                authorityGetReqVo.setId(roleAuthorityRelation.getAuthorityId());
+//                AuthorityVo authorityVo = authorityDaoImpl.load(authorityGetReqVo, AuthorityVo.class);
+//                authorityList.add(authorityVo);
+//            }
+            return roleAuthorityRelationList;
         }
         return null;
     }

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

+package com.pangding.web.authority.vo;
+
+
+import java.util.List;
+
+public interface IRoleAuthorityVo<T extends IRoleAuthorityVo>  {
+
+    String getId();
+
+    String getPid();
+
+    List<T> getChildList();
+
+}

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

@@ -11,6 +11,18 @@ public class RoleAuthorityGetReqVo {
 
     private String roleId;
 
+    private String role;
+
+    private String userId;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
     public String getReqId() {
         return reqId;
     }
@@ -34,4 +46,12 @@ public class RoleAuthorityGetReqVo {
     public void setAuthorityId(String authorityId) {
         this.authorityId = authorityId;
     }
+
+    public String getRole() {
+        return role;
+    }
+
+    public void setRole(String role) {
+        this.role = role;
+    }
 }

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

 package com.pangding.web.authority.vo.reqvo;
 
+import java.util.List;
+
 /**
  * @Author zhangjinyao
  * @create 2019/5/11 15:37
@@ -11,6 +13,8 @@ public class UserRoleGetReqVo {
 
     private String userId;
 
+    private List<String> roleIds;
+
     public String getReqId() {
         return reqId;
     }
@@ -34,4 +38,12 @@ public class UserRoleGetReqVo {
     public void setRoleId(String roleId) {
         this.roleId = roleId;
     }
+
+    public List<String> getRoleIds() {
+        return roleIds;
+    }
+
+    public void setRoleIds(List<String> roleIds) {
+        this.roleIds = roleIds;
+    }
 }

src/main/java/com/pangding/web/authority/vo/resvo/AuthorityListByLevelResVo.java

 package com.pangding.web.authority.vo.resvo;
 
 import com.pangding.web.authority.vo.AuthorityVo;
+import com.pangding.web.authority.vo.IRoleAuthorityVo;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -10,7 +12,7 @@ import java.util.List;
  */
 public class AuthorityListByLevelResVo extends AuthorityVo {
 
-    List<AuthorityListByLevelResVo> childList;
+    List<AuthorityListByLevelResVo> childList = new ArrayList<>();
 
     public List<AuthorityListByLevelResVo> getChildList() {
         return childList;

src/main/java/com/pangding/web/authority/vo/resvo/AuthorityListResVo.java

@@ -28,4 +28,12 @@ public class AuthorityListResVo {
     public void setAuthorityListByRole(List<AuthorityVo> authorityListByRole) {
         this.authorityListByRole = authorityListByRole;
     }
+
+//    public List<AuthorityListByLevelResVo> getAuthorityListByRole() {
+//        return authorityListByRole;
+//    }
+//
+//    public void setAuthorityListByRole(List<AuthorityListByLevelResVo> authorityListByRole) {
+//        this.authorityListByRole = authorityListByRole;
+//    }
 }