1. 入职登记-修改信息：根据用户id验证手机号是否重复，

2. 新用户登录不再重复弹出修改密码框

src/main/java/com/jeeplus/modules/sys/web/UserController.java

@@ -848,8 +848,7 @@ public class UserController extends BaseController {
             if("home".equals(request.getParameter("home"))){
 //                model.addAttribute("message", "修改密码成功,请重新登录");
 //                SecurityUtils.getSubject().logout();
-//                return  "modules/sys/sysHome";
-                return  "redirect:/a/home";
+                return  "modules/sys/sysHome";
             }
             return "modules/sys/userInfo";
         }

src/main/java/com/jeeplus/modules/workstaff/dao/WorkStaffBasicInfoDao.java

@@ -44,7 +44,7 @@ public interface WorkStaffBasicInfoDao extends CrudDao<WorkStaffBasicInfo> {
 
     int deleteByLogic(WorkStaffBasicInfo workStaffBasicInfo);
 
-    List<WorkStaffBasicInfo> findByMob(String mobile);
+    List<WorkStaffBasicInfo> findByMob(WorkStaffBasicInfo workStaffBasicInfo);
 
     WorkStaffBasicInfo findByCard(String cardNo);
 

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -45,6 +45,7 @@ import com.jeeplus.modules.workstaff.entity.WorkStaffExperience;
 import com.jeeplus.modules.workstaffachiveslog.dao.WorkStaffAchivesLogDao;
 import com.jeeplus.modules.workstaffachiveslog.entity.WorkStaffAchivesLog;
 import com.jeeplus.modules.workstaffachiveslog.service.WorkStaffAchivesLogService;
+import com.sun.corba.se.spi.orbutil.threadpool.Work;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -126,8 +127,8 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         return workStaffAchivesDao.getByCompanyInfo(workStaffBasicInfo);
     }
 
-    public List<WorkStaffBasicInfo> findByMob(String mobile) {
-        return workStaffBasicInfoDao.findByMob(mobile);
+    public List<WorkStaffBasicInfo> findByMob(WorkStaffBasicInfo workStaffBasicInfo) {
+        return workStaffBasicInfoDao.findByMob(workStaffBasicInfo);
     }
 
     public List<WorkStaffBasicInfo> findByName(String name) {
@@ -176,19 +177,20 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
 		super.save(workStaffBasicInfo);
 	    this.saveDetails(workStaffBasicInfo,false);
 	    //同步修改sys_user表中的name
-        User user = new User();
-        user.setId(workStaffBasicInfo.getUserId());
-        user.setName(workStaffBasicInfo.getName());
-        user.setMobile(workStaffBasicInfo.getMobile());
-        user.setLoginName(workStaffBasicInfo.getMobile());
-        user.setComId(workStaffBasicInfo.getCompany().getId());
-        user.setCompany(workStaffBasicInfo.getCompany());
-        user.setOffice(workStaffBasicInfo.getOffice());
-        if(workStaffBasicInfo.getIsNewRecord()){
-            userService.insertRole(workStaffBasicInfo);
-        }else{
+        if(roleService.getRoleIdByUserId(workStaffBasicInfo.getUserId())!=null){
+            //更新信息
+            User user = new User();
+            user.setId(workStaffBasicInfo.getUserId());
+            user.setName(workStaffBasicInfo.getName());
+            user.setMobile(workStaffBasicInfo.getMobile());
+            user.setLoginName(workStaffBasicInfo.getMobile());
+            user.setComId(workStaffBasicInfo.getCompany().getId());
+            user.setCompany(workStaffBasicInfo.getCompany());
+            user.setOffice(workStaffBasicInfo.getOffice());
             userService.updateUser(user);
             userService.updateRole(workStaffBasicInfo);
+        }else{
+            userService.insertRole(workStaffBasicInfo);
         }
 
 	}

src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java

@@ -644,8 +644,8 @@ public class WorkStaffBasicInfoController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "checkMobile")
-	public String checkMoblie(String mobile) {
-		List<WorkStaffBasicInfo> workStaffBasicInfos = workStaffBasicInfoService.findByMob(mobile);
+	public String checkMoblie(WorkStaffBasicInfo workStaffBasicInfo) {
+		List<WorkStaffBasicInfo> workStaffBasicInfos = workStaffBasicInfoService.findByMob(workStaffBasicInfo);
 		if(workStaffBasicInfos != null && workStaffBasicInfos.size()>0){
 			return "false";
 		}

src/main/resources/mappings/modules/sys/UserDao.xml

@@ -1062,10 +1062,10 @@
 		update  sys_user
 		<set>
 			<if test="loginName != null and loginName != ''">
-				loginName = #{loginName},
+				login_name = #{loginName},
 			</if>
 			<if test="passwordRemake != null and passwordRemake != ''">
-				passwordRemake = #{passwordRemake},
+				password_remake = #{passwordRemake},
 			</if>
 			<if test="name != null and name != ''">
 				name = #{name},
@@ -1082,9 +1082,6 @@
 			<if test="mobile != null and mobile != ''">
 				mobile = #{mobile},
 			</if>
-			<if test="userType != null and userType != ''">
-				userType = #{userType},
-			</if>
 			<if test="remarks != null and remarks != ''">
 				remarks = #{remarks},
 			</if>

src/main/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml

@@ -481,11 +481,11 @@
 		where user_id = #{id}
 	</update>
 
-	<select id="findByMob" parameterType="String" resultType="WorkStaffBasicInfo">
+	<select id="findByMob" parameterType="WorkStaffBasicInfo" resultType="WorkStaffBasicInfo">
 		select a.id
 		from work_staff_basic_info a
 		<where>
-			a.mobile=#{mobile}
+			a.mobile=#{mobile} and a.id != #{id}
 		</where>
 	</select>