feature 代码提交

zhsw-common/src/main/java/com/rongwei/zhsw/system/wechat/AccountService.java

@@ -15,4 +15,6 @@ public interface AccountService {
     R changeDefaultAccount(AccountBindVo accountBindVo);
 
     R info(String accountNumber);
+
+    R list();
 }

zhsw-common/src/main/java/com/rongwei/zhsw/system/wechat/impl/AccountServiceImpl.java

@@ -17,6 +17,7 @@ import com.rongwei.zhsw.system.service.impl.SwUserManagementServiceImpl;
 import com.rongwei.zhsw.system.service.impl.SwUserWechatServiceImpl;
 import com.rongwei.zhsw.system.utils.WeChatUtils;
 import com.rongwei.zhsw.system.wechat.AccountService;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -24,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -137,4 +139,11 @@ public class AccountServiceImpl implements AccountService {
         weChatHomePageVo.setDuFees(outstandingBills.stream().map(SwBillManagementUnpaidDo::getActualdue).reduce(BigDecimal::add).orElse(BigDecimal.ZERO));
         return R.ok(weChatHomePageVo);
     }
+
+    @Override
+    public R list() {
+        String currentWeChatOpenId = WeChatUtils.getCurrentWeChatOpenId();
+        List<SwUserManagementVo> userByDsKey = weChatLoginService.getAllOwnerByOpenId(currentWeChatOpenId, null);
+        return R.ok(userByDsKey);
+    }
 }

zhsw-common/src/main/resources/mybatis/zhsw/SwUserManagementDao.xml

@@ -12,7 +12,7 @@
     <select id="getUserByDsKey" resultType="com.rongwe.zhsw.system.vo.SwUserManagementVo">
         select * from
         <foreach collection="para" index="key" item="value" separator="union all" open="(" close=") A">
-            select swm.*,#{key} as dsKey,ifnull(suw.DEFAULTACCOUNT,0) AS defaultAccount from ${key}.sw_user_management
+            select swm.*,#{key} as dsKey,ifnull(suw.DEFAULTACCOUNT,0) AS defaultAccount ,suw.groupName as GROUPNAME from ${key}.sw_user_management
             swm
             left join ${key}.sw_user_wechat suw on swm.ID=suw.USERID and suw.DELETED='0'
             <where>

zhsw-entity/src/main/java/com/rongwe/zhsw/system/vo/SwUserManagementVo.java

@@ -20,6 +20,8 @@ public class SwUserManagementVo  extends SwUserManagementDo {
     private String dsKey;
     // 是否默认账户
     private String defaultAccount;
+    // 分组名
+    private String groupName;
     private List<String> wechatSign =new ArrayList<>();
 
     public void setWechatSign(String wechatSign) {

zhsw-server/src/main/java/com/rongwei/zhsw/system/controller/weChat/AccountController.java

@@ -44,6 +44,10 @@ public class AccountController {
         return accountService.info(accountNumber);
     }
 
+    @GetMapping("/list")
+    private R info() {
+        return accountService.list();
+    }
 
 
 }