bug 修复

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -117,4 +117,11 @@ public class Constant {
      * 报名状态 未报名
      */
     public static final String STATUS_UNSIGN = "unsigned";
+    
+    /**
+     * 运营端修改管理员已存在
+     */
+	public static final String ADMIN_IS_EXIST = "管理员账号已存在";
+	
+    public static final String SUCCESS = "success";
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/CommunityController.java

@@ -1,5 +1,6 @@
 package com.community.huiju.controller;
 
+import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.model.ToCommunities;
 import com.community.huiju.service.CommunityServiceI;
@@ -95,8 +96,13 @@ public class CommunityController {
 	@RequestMapping(value = "/community/update",method = RequestMethod.POST)
 	public ResponseBean updateCommunityById(@RequestBody ToCommunities toCommunities){
 		ResponseBean responseBean = new ResponseBean();
-		Integer size = communityService.updateCommunityById(toCommunities);
-		responseBean.addSuccess(size);
+		String message = communityService.updateCommunityById(toCommunities);
+		if (message.equals(Constant.SUCCESS)){
+			responseBean.addSuccess(message);
+		}else {
+			responseBean.addError(message);
+		}
+		
 		return responseBean;
 	}
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/TpUserMapper.java

@@ -2,6 +2,7 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface TpUserMapper {
@@ -16,4 +17,8 @@ public interface TpUserMapper {
     int updateByPrimaryKeySelective(TpUser record);
 
     int updateByPrimaryKey(TpUser record);
+    
+    TpUser selectByTel(@Param("id") Integer id,@Param("loginName") String loginName);
+    
+    int updateByTel(@Param("id") Integer id,@Param("loginName") String loginName,@Param("userName") String userName,@Param("oldTel") String oldTel);
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/CommunityServiceI.java

@@ -35,5 +35,5 @@ public interface CommunityServiceI {
 	 * @param toCommunities
 	 * @return
 	 */
-	Integer updateCommunityById(ToCommunities toCommunities);
+	String updateCommunityById(ToCommunities toCommunities);
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/CommunityServiceImpl.java

@@ -96,7 +96,17 @@ public class CommunityServiceImpl implements CommunityServiceI {
 	 * @return
 	 */
 	@Override
-	public Integer updateCommunityById(ToCommunities toCommunities) {
-		return toCommunitiesMapper.updateByPrimaryKeySelective(toCommunities);
+	public String updateCommunityById(ToCommunities toCommunities) {
+		ToCommunities oldCommunities = toCommunitiesMapper.selectByPrimaryKey(toCommunities.getId());
+		//未修改前的电话号码
+		String oldTel = oldCommunities.getLoginName();
+		//判断电话号码是否重复
+		TpUser tpUser = tpUserMapper.selectByTel(toCommunities.getId(),toCommunities.getLoginName());
+		if (null != tpUser && !tpUser.getLoginName().equals(oldTel)){
+			return Constant.ADMIN_IS_EXIST;
+		}
+		tpUserMapper.updateByTel(toCommunities.getId(),toCommunities.getLoginName(),toCommunities.getUserName(),oldTel);
+		toCommunitiesMapper.updateByPrimaryKeySelective(toCommunities);
+		return Constant.SUCCESS;
 	}
 }

CODE/smart-community/operate-api/src/main/resources/mapper/ToCommunitiesMapper.xml

@@ -130,6 +130,12 @@
       <if test="latitude != null" >
         latitude = #{latitude,jdbcType=VARCHAR},
       </if>
+      <if test="userName != null" >
+        user_name = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="loginName != null" >
+        login_name = #{loginName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>

CODE/smart-community/operate-api/src/main/resources/mapper/TpUserMapper.xml

@@ -185,4 +185,26 @@
       update_date = #{updateDate,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="selectByTel" resultMap="BaseResultMap">
+      select <include refid="Base_Column_List" /> from tp_user
+      where community_id = #{id,jdbcType=INTEGER}
+      and login_name = #{loginName,jdbcType=VARCHAR}
+      and status = 1
+  </select>
+
+  <update id="updateByTel">
+    update tp_user
+    <set>
+      <if test="userName != null" >
+        user_name = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="loginName != null" >
+        login_name = #{loginName,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where community_id = #{id,jdbcType=INTEGER}
+    and login_name = #{oldTel,jdbcType=VARCHAR}
+    and status = 1
+  </update>
 </mapper>

VUECODE/smart-operate-manage/src/store/modules/community.js

@@ -92,7 +92,7 @@ const community = {
     UpdateCommunity({ commit }, datail) {
       return new Promise((resolve, reject) => {
         updateCommunity(datail).then(response => {
-          resolve()
+          resolve(response)
         }).catch(error => {
           reject(error)
         })

VUECODE/smart-operate-manage/src/views/community/communityTable.vue

@@ -423,15 +423,17 @@ export default {
     updateData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.UpdateCommunity(this.detail).then(() => {
+          this.UpdateCommunity(this.detail).then((res) => {
             this.dialogFormVisible = false
-            this.$notify({
-              title: '成功',
-              message: '更新成功',
-              type: 'success',
-              duration: 2000
-            })
-            this.getList()
+            if (res.code == 0) {
+              this.$message({
+                message: '更新成功',
+                type: 'success'
+              })
+              this.getList()
+            }else if (res.code == 0) {
+              this.$message.error(res.message)
+            }
           })
         }
       })