Bläddra i källkod

http://192.168.0.21/index.php?m=bug&f=view&bugID=25611

lyhzzz 3 år sedan
förälder
incheckning
9b09ca4eb6

+ 5 - 2
platform-common/src/main/java/com/platform/service/impl/ZhiHouseService.java

@@ -303,14 +303,17 @@ public class ZhiHouseService {
         return message;
     }
 
-    public JSONObject getSysUserListPageByDeptIdsAndUserName(Long deptId,Long page,Long limit, String username) {
+    public JSONObject getSysUserListPageByDeptIdsAndUserName(Long deptId,Long page,Long limit, String username,String token) {
         Map<String, Object> mp = new HashMap<>();
         mp.put("username", username);
         mp.put("companyId", deptId);
         mp.put("page", page);
         mp.put("limit", limit);
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("token", token);
         String url = zhiHouseHost + "api/shop/queryAllUserPageByDeptIdAndUserName";
-        ResponseEntity<ReturnDTO>  responseEntity = restTemplate.postForEntity(url, mp,ReturnDTO.class);
+        HttpEntity<Object> formEntity = new HttpEntity<>(mp, headers);
+        ResponseEntity<ReturnDTO> responseEntity = restTemplate.postForEntity(url,formEntity,ReturnDTO.class);
         if(responseEntity.getStatusCode()!= HttpStatus.OK){
             throw new CommonBaseException(ResultCodeEnum.D100);
         }

+ 4 - 1
platform-common/src/main/java/com/platform/utils/WxOpUtils.java

@@ -286,9 +286,12 @@ public class WxOpUtils {
                             }else{
                                 throw new CommonBaseException(ResultCodeEnum.D3016);
                             }
+                        }else {
+                            throw new CommonBaseException(ResultCodeEnum.D3016);
                         }
+                    }else {
+                        throw new CommonBaseException(ResultCodeEnum.D3016);
                     }
-                    throw new CommonBaseException(ResultCodeEnum.D3016);
                 }else{
                     log.info("微信返回内容长度大于1000");
                 }

+ 3 - 6
platform-shop/src/main/java/com/platform/controller/SysUserController.java

@@ -9,10 +9,7 @@ import com.platform.utils.PageUtilsPlus;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -39,10 +36,10 @@ public class SysUserController extends AbstractController {
      * 店铺绑定的用户列表
      */
     @PostMapping("/bindList")
-    public Result userBindList(@RequestBody JSONObject param) {
+    public Result userBindList( @RequestHeader String token ,@RequestBody JSONObject param) {
         // 查询用户信息
         JSONObject result = zhiHouseService.getSysUserListPageByDeptIdsAndUserName(getCompanyId(),
-                param.getLong("page"),param.getLong("limit"), param.getString("username"));
+                param.getLong("page"),param.getLong("limit"), param.getString("username"),token);
         List<Object> users = result.getJSONArray("list");
         if(!ObjectUtils.isEmpty(users)){
             users = users.stream().map(object -> {