From 0a9b6e565843bd25e5ef37e979c7da9bbf3df218 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 22 四月 2022 17:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/bmo/staffAppAuth/impl/GetStaffAppAuthBMOImpl.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/bmo/staffAppAuth/impl/GetStaffAppAuthBMOImpl.java b/service-user/src/main/java/com/java110/user/bmo/staffAppAuth/impl/GetStaffAppAuthBMOImpl.java
old mode 100644
new mode 100755
index 1bf6f46..4a5c04a
--- a/service-user/src/main/java/com/java110/user/bmo/staffAppAuth/impl/GetStaffAppAuthBMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/bmo/staffAppAuth/impl/GetStaffAppAuthBMOImpl.java
@@ -1,15 +1,16 @@
package com.java110.user.bmo.staffAppAuth.impl;
import com.java110.dto.staffAppAuth.StaffAppAuthDto;
+import com.java110.dto.user.UserDto;
import com.java110.intf.user.IStaffAppAuthInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.user.bmo.staffAppAuth.IGetStaffAppAuthBMO;
+import com.java110.utils.util.Assert;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
import java.util.List;
@Service("getStaffAppAuthBMOImpl")
@@ -18,27 +19,38 @@
@Autowired
private IStaffAppAuthInnerServiceSMO staffAppAuthInnerServiceSMOImpl;
+ @Autowired
+ private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
/**
* @param staffAppAuthDto
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public ResponseEntity<String> get(StaffAppAuthDto staffAppAuthDto) {
+ UserDto userDto = new UserDto();
+ userDto.setUserId(staffAppAuthDto.getStaffId());
+ List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
+ Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
+ staffAppAuthDto.setStaffName(userDtos.get(0).getName());
- int count = staffAppAuthInnerServiceSMOImpl.queryStaffAppAuthsCount(staffAppAuthDto);
+ List<StaffAppAuthDto> staffAppAuthDtos = staffAppAuthInnerServiceSMOImpl.queryStaffAppAuths(staffAppAuthDto);
- List<StaffAppAuthDto> staffAppAuthDtos = null;
- if (count > 0) {
- staffAppAuthDtos = staffAppAuthInnerServiceSMOImpl.queryStaffAppAuths(staffAppAuthDto);
+ if (staffAppAuthDtos == null || staffAppAuthDtos.size() < 1) {
+ staffAppAuthDto.setStateName("鏈璇�");
+ staffAppAuthDto.setState("1001");
+ staffAppAuthDto.setOpenId("-");
+ staffAppAuthDto.setAppType("-");
+ staffAppAuthDto.setOpenName("-");
} else {
- staffAppAuthDtos = new ArrayList<>();
+ staffAppAuthDto.setStateName("宸茶璇�");
+ staffAppAuthDto.setState("2002");
+ staffAppAuthDto.setOpenId(staffAppAuthDtos.get(0).getOpenId());
+ staffAppAuthDto.setAppType(staffAppAuthDtos.get(0).getAppType());
+ staffAppAuthDto.setOpenName(staffAppAuthDtos.get(0).getOpenName());
+ staffAppAuthDto.setCreateTime(staffAppAuthDtos.get(0).getCreateTime());
}
-
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) staffAppAuthDto.getRow()), count, staffAppAuthDtos);
-
- ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
-
- return responseEntity;
+ return ResultVo.createResponseEntity(staffAppAuthDto);
}
}
--
Gitblit v1.8.0