dcs 10 meses atrás
pai
commit
2c04f34e5e

+ 2 - 0
virgo.core/src/main/java/com/bosshand/virgo/core/dao/MgrOrganizationProjectDao.java

@@ -14,6 +14,8 @@ public interface MgrOrganizationProjectDao {
 
     List<MgrOrganizationProject> getUserProject(long userId);
 
+    List<MgrOrganizationProject> getBindOrganizationId(long bindOrganizationId);
+
     List<MgrOrganizationProject> getList(MgrOrganizationProject mgrOrganizationProject);
 
     int insert(MgrOrganizationProject mgrOrganizationProject);

+ 15 - 0
virgo.core/src/main/java/com/bosshand/virgo/core/service/MgrUserService.java

@@ -305,6 +305,21 @@ public class MgrUserService {
 						});
 					}
 				}
+
+				// 关联公司
+				List<MgrOrganizationProject> bindOrganizationList = mgrOrganizationProjectDao.getBindOrganizationId(user.getLastOrganizationId());
+				if (bindOrganizationList != null && bindOrganizationList.size() > 0) {
+					for (MgrOrganizationProject bind : bindOrganizationList) {
+						if(map.containsKey(bind.getProjectId())){
+							Set<JSONObject> jsonObjects = map.get(bind.getProjectId());
+							jsonObjects.add(convert(bind.getIdentityId()));
+						}else {
+							Set<JSONObject> identityList = new HashSet<>();
+							identityList.add(convert(bind.getIdentityId()));
+							map.put(bind.getProjectId(), identityList);
+						}
+					}
+				}
 			}
 		}
 

+ 4 - 0
virgo.core/src/main/resources/mapper/MgrOrganizationProjectMapper.xml

@@ -32,6 +32,10 @@
         select * from mgr_organization_project where projectId = #{projectId} and userId = #{userId}
     </select>
 
+    <select id="getBindOrganizationId" resultMap="mgrOrganizationProjectResult">
+        select * from mgr_organization_project where bindOrganizationId = #{bindOrganizationId}
+    </select>
+
     <select id="getUserProject" resultMap="mgrOrganizationProjectResult">
         select * from mgr_organization_project where userId = #{userId}
     </select>