1. 更新用户时更新机构

2. admin管理用户列表添加机构信息

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/dao/PensionOrganizationUserDao.java

@@ -17,4 +17,6 @@ public interface PensionOrganizationUserDao extends BaseDao<PensionOrganizationU
 
     void deleteByUserIds(Long[] ids);
 
+    void updateByUserId(Long orgId, Long userId);
+
 }
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/service/PensionOrganizationUserService.java

@@ -16,4 +16,6 @@ public interface PensionOrganizationUserService extends CrudService<PensionOrgan
 
     void deleteByUserIds(Long[] ids);
 
+    void updateByUserId(Long orgId, Long userId);
+
 }
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/service/impl/PensionOrganizationUserServiceImpl.java

@@ -43,4 +43,9 @@ public class PensionOrganizationUserServiceImpl extends CrudServiceImpl<PensionO
     public void deleteByUserIds(Long[] ids) {
         pensionOrganizationUserDao.deleteByUserIds(ids);
     }
+
+    @Override
+    public void updateByUserId(Long orgId, Long userId) {
+        pensionOrganizationUserDao.updateByUserId(orgId, userId);
+    }
 }
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/sys/controller/SysUserController.java

@@ -77,6 +77,15 @@ public class SysUserController {
 
         PageData<SysUserDTO> page = sysUserService.page(params);
 
+        for (int i = 0; i < page.getList().size(); i++) {
+            Long uId = page.getList().get(i).getId();
+            Long orgId = pensionOrganizationUserService.findUserOrgId(uId);
+            page.getList().get(i).setOrgId(orgId);
+            try {
+                page.getList().get(i).setOrgName(pensionOrganizationService.get(orgId).getName());
+            }catch(Exception ignore){}
+        }
+
         return new Result<PageData<SysUserDTO>>().ok(page);
     }
 

hmit-admin/src/main/java/io/hmit/modules/sys/service/impl/SysUserServiceImpl.java

@@ -171,6 +171,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         sysUserEntity.setPassword(password);
         if (null != dto.getId()) {
             updateById(sysUserEntity);
+            pensionOrganizationUserService.updateByUserId(dto.getOrgId(), dto.getId());
         } else {
             sysUserEntity.setSuperAdmin(0);
             insert(sysUserEntity);

hmit-admin/src/main/resources/mapper/serviceOrder/PensionOrganizationUserDao.xml

@@ -23,4 +23,7 @@
         </foreach>
     </delete>
 
+    <update id="updateByUserId" parameterType="Long">
+        UPDATE pension_organization_user SET organization_id = #{orgId} WHERE user_id = #{userId}
+    </update>
 </mapper>
\ No newline at end of file

hmit-api/src/main/resources/mapper/serviceOrder/PensionEventDao.xml

@@ -29,7 +29,7 @@
     </resultMap>
 
     <select id="getEventForUser" resultType="io.hmit.modules.serviceOrder.dto.PensionEventDTO">
-        SELECT pe.id, pe.event_title, pe.event_image_url, pe.event_org_name, pe.event_date
+        SELECT pe.id, pe.event_title, pe.event_image_url, pe.event_org_name, pe.event_date, pe.create_date
         FROM pension_event pe WHERE pe.status != 0 AND pe.status != 4
     </select>