小程序菜单权限配置更换接口位置

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppUserIdMenuDTO.java

@@ -19,7 +19,7 @@ public class AppUserIdMenuDTO implements Serializable {
 
     @ApiModelProperty(value = "用户所属网格ID")
 //    @NotBlank(message="用户ID不能为空")
-    private Long gridId;
+    private String gridId;
 
     @ApiModelProperty(value = "部门ID")
     @NotBlank(message="部门ID不能为空")

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java

@@ -6,6 +6,8 @@ import com.elink.esua.epdc.dto.AppUserIdMenuDTO;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.service.AdminService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +17,7 @@ import org.springframework.stereotype.Service;
  * @date 2019/9/11 9:40
  */
 @Service
+@Slf4j
 public class AdminServiceImpl implements AdminService {
 
 
@@ -45,7 +48,13 @@ public class AdminServiceImpl implements AdminService {
 
     @Override
     public Result getAppMenu(TokenDto userDetail, AppUserIdMenuDTO dto) {
-        dto.setGridId(userDetail.getGridId());
+        log.info("+++++userDetail.getGridId():+++++:" + userDetail.getGridId());
+        log.info("+++++dto.getDeptId():+++++:" + dto.getDeptId());
+        String gridId = userDetail.getGridId() == null ? "" : userDetail.getGridId().toString();
+        if(StringUtils.isBlank(gridId)){
+            return new Result().error("token中缺失网格ID");
+        }
+        dto.setGridId(gridId);
         return adminFeignClient.getAppMenu(dto);
     }
 }