新需求

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -112,7 +112,12 @@ public class TaUser implements Serializable {
     private String address;
     private String photo;
     private String description;
-    
+
+    /**
+     * 权重
+     */
+    private String weight;
+
     /**
      * 是否置业顾问
      */

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

@@ -29,4 +29,6 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
 	List<TaUser> getUserList(@Param("phone") String phone,@Param("loginName") String loginName,@Param("orgId") Integer orgId);
 
     IPage<TaUser> seleUserList(IPage pg,@Param("taUser") TaUser taUser,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    Integer validateWeight(@Param("buildingIds") List<String> buildingIds, @Param("buildingId") String buildingId, @Param("weight") String weight, @Param("userId")Integer userId);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -378,7 +378,12 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		if (StringUtils.isEmpty(taUser.getLoginName())) {
 			taUser.setLoginName(taUser.getPhone());
 		}
-		
+
+		boolean weightCount = validateWeight(taUser, "add");
+		if(weightCount){
+			throw new Exception("同一项目下权重值不能重复");
+		}
+
 		List<TaUser> taUserList = taUserMapper.getUserList(taUser.getPhone(),taUser.getLoginName(),null);
 		if (null != taUserList && taUserList.size() > 0) {
 			throw new Exception("电话号码或登录名重复");
@@ -443,10 +448,18 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		if (StringUtils.isEmpty(taUser.getUserName())) {
 			throw new Exception("用户名称不能为空");
 		}
+		if (!StringUtils.isEmpty(taUser.getWeight()) && taUser.getWeight().length() > 11){
+			throw new Exception("权重最大为11位");
+		}
 		if(StringUtils.isEmpty(taUser.getLoginName()) && taUserBefore.getLoginName().equals(taUserBefore.getPhone())){
 			taUser.setLoginName(taUser.getPhone());
 		}
 
+		boolean weightCount = validateWeight(taUser, "update");
+		if(weightCount){
+			throw new Exception("同一项目下权重值不能重复");
+		}
+
 		QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
 		wrapper.nested(q -> q.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName()));
 		wrapper.eq("org_id",taUser.getOrgId());
@@ -625,4 +638,23 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 		return this.update(updateWrapper);
 	}
+
+	public boolean validateWeight(TaUser taUser, String operateType){
+		Integer count;
+		if(taUser.getIsConsultant() != null && taUser.getIsConsultant()){
+			String buildingId = taUser.getBuildingId();
+			String weight = taUser.getWeight();
+			count = taUserMapper.validateWeight(null, buildingId, weight, operateType.equals("add") ? null : taUser.getUserId());
+		}else{
+			List<String> buildingIds = taUser.getBuildingIds();
+			String weight = taUser.getWeight();
+			count = taUserMapper.validateWeight(buildingIds, null, weight, operateType.equals("add") ? null : taUser.getUserId());
+		}
+
+		if (count > 0 ){
+			return true;
+		}
+		return false;
+	}
+
 }

src/main/resources/mapper/TaPersonMapper.xml

@@ -50,7 +50,7 @@
         and t.org_id = #{orgId}
         and u.org_id = #{orgId}
         and u.status = 1
-        ORDER BY
+        ORDER BY u.weight desc,
             t.create_date DESC
     </select>
 

src/main/resources/mapper/TaUserMapper.xml

@@ -87,5 +87,28 @@
                 </foreach>
             </if>
             GROUP BY user_id
+            order by t.weight desc, create_date desc
     </select>
+
+    <select id="validateWeight" resultType="integer">
+      select count(*) from ta_user t
+      LEFT JOIN ta_person_building a on t.user_id = a.user_id
+      where 1=1
+      <if test="weight != null and weight != ''">
+          and t.weight = #{weight}
+      </if>
+      <if test="buildingIds != null and buildingIds.size() > 0 ">
+          and a.building_id in
+          <foreach collection="buildingIds" item="item" index="index" open="(" close=")" separator=",">
+              #{item}
+          </foreach>
+      </if>
+      <if test="buildingId != null and buildingId != '' ">
+          and a.building_id = #{buildingId}
+      </if>
+      <if test="userId != null and userId != ''">
+          and t.user_id != #{userId}
+      </if>
+    </select>
+
 </mapper>