修改

tianhu-system/src/main/java/com/tianhu/system/companyAuth/controller/OwnAuthController.java

@@ -756,46 +756,31 @@ public class OwnAuthController extends BaseController {
     public R cashBack() throws Exception {
         //获取登录用户
         LoginUser user = tokenService.getLoginUser();
-        String userName= user.getSysUser().getUserName();
-        OwnSysUser  ownSysUser =new OwnSysUser();
-        ownSysUser.setUserName(userName);
-        List<OwnSysUser> userList = ownSysUserService.selectUserList(ownSysUser);
-        SysCompany list =null;
-        Map map =new HashMap();
-        if(userList.size()>0){
-            //查询账户
-            LambdaQueryWrapper<SysUserCompanyRel> userCompanyRel = new LambdaQueryWrapper<>();
-            //所属银行
-            userCompanyRel.eq(SysUserCompanyRel::getSucrUserId,userList.get(0).getUserId());
-            userCompanyRel.orderByDesc(SysUserCompanyRel::getCreateTime);
-            List<SysUserCompanyRel> userCompanyRelList = sysUserCompanyRelService.findSysUserCompanyRels(userCompanyRel);
-            if(userCompanyRelList.size()>0){
-                list  = sysCompanyService.getById(userCompanyRelList.get(0).getSucrCompanyId());
-                map.put("list",list);
-                if(list!=null){
-                    //查询账户
-                    LambdaQueryWrapper<PayBankAccInf> bank = new LambdaQueryWrapper<>();
-                    //所属银行
-                    bank.eq(PayBankAccInf::getPbaiCstno,list.getScyId());
-                    bank.orderByDesc(PayBankAccInf::getPbaiCfcaDate);
-                    List<PayBankAccInf> bankAcc = payBankAccInfService.findPayBankAccInfs(bank);
-                    //查询经办人
-                    LambdaQueryWrapper<SysUserCompanyRel> sysUserCompanyRel = new LambdaQueryWrapper<>();
-                    sysUserCompanyRel.eq(SysUserCompanyRel::getSucrCompanyId,list.getScyId());
-                    sysUserCompanyRel.eq(SysUserCompanyRel::getSucrHandler,"1");
-                    List<SysUserCompanyRel> userCompanyRels = sysUserCompanyRelService.findSysUserCompanyRels(sysUserCompanyRel);
-                  if (userCompanyRels.size()>0){
-                      OwnSysUser  sysUser =new OwnSysUser();
-                      sysUser.setUserId(userCompanyRels.get(0).getSucrUserId().toString());
-                      List<OwnSysUser> users = ownSysUserService.selectUserList(sysUser);
-                      map.put("user",users);
-                  }
-                    map.put("data",bankAcc);
-                    map.put("userCompany",userCompanyRels);
+        Map map = new HashMap();
+        // 登陆时选择了企业
+        if (user.getSysUser().getCompanyId() != null) {
+            SysCompany list  = sysCompanyService.getById(user.getSysUser().getCompanyId());
+            map.put("list", list);
+            if(list != null){
+                //查询账户
+                LambdaQueryWrapper<PayBankAccInf> bank = new LambdaQueryWrapper<>();
+                //所属银行
+                bank.eq(PayBankAccInf::getPbaiCstno,list.getScyId());
+                bank.orderByDesc(PayBankAccInf::getPbaiCfcaDate);
+                List<PayBankAccInf> bankAcc = payBankAccInfService.findPayBankAccInfs(bank);
+                //查询经办人
+                LambdaQueryWrapper<SysUserCompanyRel> sysUserCompanyRel = new LambdaQueryWrapper<>();
+                sysUserCompanyRel.eq(SysUserCompanyRel::getSucrCompanyId,list.getScyId());
+                sysUserCompanyRel.eq(SysUserCompanyRel::getSucrHandler,"1");
+                List<SysUserCompanyRel> userCompanyRels = sysUserCompanyRelService.findSysUserCompanyRels(sysUserCompanyRel);
+                if (userCompanyRels.size() > 0){
+                    SysUser handle = userService.selectUserById(userCompanyRels.get(0).getSucrUserId());
+                    map.put("user", handle);
                 }
+                map.put("data",bankAcc);
+                map.put("userCompany",userCompanyRels);
             }
         }
         return R.ok(map);
     }
-
 }