Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

         }else {
             TaUser user = new TaUser();
             user.setLoginName(loginName);
+            user.setCommunityId(Integer.valueOf(communityId));
             ResponseBean result = register(user);
 
-            ToCommunities communities = toCommunitiesMapper.selectByPrimaryKey(currentUser.getCommunityId());
+            ToCommunities communities = toCommunitiesMapper.selectByPrimaryKey(user.getCommunityId());
             TaUserVO taUserVO = (TaUserVO) result.getData();
             taUserVO.setCommunityName(communities.getCommunityName());
 
         user.setAcceptAgreementStatus("1");
         user.setUserName(user.getLoginName());
         user.setRemark("这是系统自动注册!");
-        user.setCommunityId(3);
         user.setVerifyStatus("1");
         user.setFaceStatus("0");
         //user.setLoginPassword(MD5Utils.encode(user.getLoginPassword()));
         // 更新
         taUserMapper.updateByPrimaryKeySelective(user);
 
-        // TODO 这里先默认 type=0 (租客), 后期需要和 资料库对接
-        addUserRole(0,response,user);
+        // TODO 这里先默认 type=2 (租客), 后期需要和 资料库对接
+        addUserRole(2,response,user);
 
 
 
     /**
      * 公共方法,添加角色.
      *      用于注册 和 业主添加家属和租客
-     * @param type 0 是租客  1 是家属
+     * @param type 1是业主 2 是租客  3 是家属
      * @param response
      * @param user
      */
     private void addUserRole(Integer type,ResponseBean response,TaUser user){
         // 先查询角色 在角色关联记录
         // 这里的 2 或者 3 是对应角色编号
-        int roleType = type.equals("0") ? 2 : 3;
+        int roleType = type.equals("1") ? 1 : type.equals("2") ? 2 : 3;
         TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(roleType);
         if (null == taSysRole) {
             response.addError("该权限不存在!");
             if (resultRole > 0) {
                 response.addSuccess("添加成功!");
             } else {
-                throw new RuntimeException("租客或者家属角色权限添加失败");
+                throw new RuntimeException("业主或者租客或者家属角色权限添加失败");
             }
         } catch (Exception e) {
             response.addSuccess("添加失败!");
-            log.error("租客或者家属角色权限添加失败!",e);
-            throw new RuntimeException("租客或者家属角色权限添加失败");
+            log.error("业主或者租客或者家属角色权限添加失败!",e);
+            throw new RuntimeException("业主或者租客或者家属角色权限添加失败");
         }
     }
 

CODE/smart-community/app-api/src/main/resources/mapper/TaUserMapper.xml

     delete from ta_user
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.community.huiju.model.TaUser" >
+  <insert id="insert" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
     insert into ta_user (id, community_id, building_owner_info_id,
       head_portrait, user_name, login_name,
       login_password, email, gender,
       #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" >
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
     insert into ta_user
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >