Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java

@@ -365,8 +365,8 @@ public class CustomerAgencyController {
      * @Date 2021/9/8 15:20
      */
     @PostMapping("agencygridtree")
-    public Result<AgencyTreeResultDTO> getOrgTreeData(/*@LoginUser*/ TokenDto tokenDTO) {
-        tokenDTO.setUserId("dffe71e021a61b900f9025f4f07f6955");
+    public Result<AgencyTreeResultDTO> getOrgTreeData(@LoginUser TokenDto tokenDTO) {
+        //tokenDTO.setUserId("dffe71e021a61b900f9025f4f07f6955");
         return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getOrgTreeData(tokenDTO.getUserId()));
     }
 

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -498,7 +498,7 @@
         icvol.VOLUNTEER_CATEGORY as volunteerCategoriesStr
         from user_base_info userbaseinfo
         inner join ic_resi_user icuser on (userbaseinfo.ID_NUM = icuser.ID_CARD and icuser.DEL_FLAG = '0')
-        left join ic_volunteer icvol on (icuser.ID = icvol.IC_RESI_USER and icvol.DEL_FLAG = '0')
+        inner join ic_volunteer icvol on (icuser.ID = icvol.IC_RESI_USER and icvol.DEL_FLAG = '0')
         where userbaseinfo.DEL_FLAG = '0'
         and userbaseinfo.ID_NUM is not null
         and userbaseinfo.USER_ID in