合并积分分支

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit 037ee6574bf347ae34d5251735a99c5511d81794
+Subproject commit 110c38f14ec395bda689074def3f8a56803e6d04

epdc-cloud-commons-yushan

@@ -1 +1 @@
-Subproject commit 9d7cf7e81ccc634751f032f72e5333a90eb40ee2
+Subproject commit 128c6a4bfb8087999b492a6febfdde984623fe3a

epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -42,6 +42,7 @@ import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.*;
 import com.elink.esua.epdc.config.StreamUtils;

epdc-cloud-user/src/main/resources/mapper/UserDao.xml

@@ -39,8 +39,6 @@
                 LEFT JOIN ( SELECT gr.ALL_DEPT_NAMES, gr.USER_ID FROM epdc_user_grid_relation gr WHERE gr.DEL_FLAG = '0' AND gr.USER_ID = #{id} ORDER BY gr.UPDATED_TIME DESC LIMIT 0, 1 ) eugr ON ( eu.id = eugr.USER_ID )
                 LEFT JOIN epdc_user_info ui ON eu.ID = ui.USER_ID
                 AND ui.DEL_FLAG = '0'
-        Left Join (select * from  epdc_user_grid_relation  where USER_ID = #{id} order by UPDATED_TIME desc limit 0,1) eugr
-            on(eu.id=eugr.USER_ID)
         left join epdc_points_grade g ON 1=1 AND g.DEL_FLAG = 0
         LEFT JOIN epdc_volunteer_info v ON eu.ID = v.USER_ID
         WHERE