|  | @ -394,6 +394,14 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
 | 
	
		
			
				|  |  |                 WlyyUserEquipmentDO userEquipmentDO = new WlyyUserEquipmentDO();
 | 
	
		
			
				|  |  |                 userEquipmentDO.setDel(1);
 | 
	
		
			
				|  |  |                 userEquipmentDO.setUserId(userDO.getId());
 | 
	
		
			
				|  |  |                 userEquipmentDO.setCity(object.getString("city"));
 | 
	
		
			
				|  |  |                 userEquipmentDO.setCityName(object.getString("cityName"));
 | 
	
		
			
				|  |  |                 userEquipmentDO.setTown(object.getString("town"));
 | 
	
		
			
				|  |  |                 userEquipmentDO.setTownName(object.getString("townName"));
 | 
	
		
			
				|  |  |                 if (!StringUtils.isEmpty(object.getString("hospital"))){
 | 
	
		
			
				|  |  |                     userEquipmentDO.setHospital(object.getString("hospital"));
 | 
	
		
			
				|  |  |                     userEquipmentDO.setHospitalName(object.getString("hospitalName"));
 | 
	
		
			
				|  |  |                 }
 | 
	
		
			
				|  |  |                 userEquipmentDO.setEquipmentId(object.getString("equipmentId"));
 | 
	
		
			
				|  |  |                 userEquipmentDO.setEquipmentName(object.getString("equipmentName"));
 | 
	
		
			
				|  |  |                 userEquipmentDO.setCreateTime(new Date());
 | 
	
	
		
			
				|  | @ -426,6 +434,8 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
 | 
	
		
			
				|  |  |         JSONObject jsonObject = JSONObject.parseObject(jsonData);
 | 
	
		
			
				|  |  |         JSONObject user = jsonObject.getJSONObject("user");
 | 
	
		
			
				|  |  |         JSONArray org = jsonObject.getJSONArray("org");
 | 
	
		
			
				|  |  |         JSONArray area = jsonObject.getJSONArray("area");
 | 
	
		
			
				|  |  |         JSONArray equipment = jsonObject.getJSONArray("equipment");
 | 
	
		
			
				|  |  |         if (null == user ||  CollectionUtils.isEmpty(org) && !user.getString("saasId").equalsIgnoreCase(defaultSaasId)) {
 | 
	
		
			
				|  |  |             result.put("msg", "请点击机构管理选择所在机构");
 | 
	
		
			
				|  |  |             result.put("response", ConstantUtils.FAIL);
 | 
	
	
		
			
				|  | @ -469,6 +479,53 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
 | 
	
		
			
				|  |  |             }
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         //area:[{"city":"","cityName":"","town":"","townName":"","hospital":"","hospitalName":""}]
 | 
	
		
			
				|  |  |         //用户所属区域添加
 | 
	
		
			
				|  |  |         if (area!=null&&area.size()!=0){
 | 
	
		
			
				|  |  |             userAreaDao.deleteByUserId(userDO.getId());
 | 
	
		
			
				|  |  |             for (int i=0;i<area.size();i++){
 | 
	
		
			
				|  |  |                 JSONObject object = area.getJSONObject(i);
 | 
	
		
			
				|  |  |                 WlyyUserAreaDO userAreaDO = new WlyyUserAreaDO();
 | 
	
		
			
				|  |  |                 userAreaDO.setUserId(userDO.getId());
 | 
	
		
			
				|  |  |                 userAreaDO.setCity(object.getString("city"));
 | 
	
		
			
				|  |  |                 userAreaDO.setCityName(object.getString("cityName"));
 | 
	
		
			
				|  |  |                 userAreaDO.setTown(object.getString("town"));
 | 
	
		
			
				|  |  |                 userAreaDO.setTownName(object.getString("townName"));
 | 
	
		
			
				|  |  |                 if (!StringUtils.isEmpty(object.getString("hospital"))){
 | 
	
		
			
				|  |  |                     userAreaDO.setHospital(object.getString("hospital"));
 | 
	
		
			
				|  |  |                     userAreaDO.setHospitalName(object.getString("hospitalName"));
 | 
	
		
			
				|  |  |                 }
 | 
	
		
			
				|  |  |                 userAreaDO.setCreateTime(new Date());
 | 
	
		
			
				|  |  |                 userAreaDO.setUpdateTime(new Date());
 | 
	
		
			
				|  |  |                 userAreaDO.setDel(1);
 | 
	
		
			
				|  |  |                 userAreaDao.save(userAreaDO);
 | 
	
		
			
				|  |  |             }
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         //用户所管设备添加
 | 
	
		
			
				|  |  |         //equipment:[{"equipmentId":"","equipmentName":""}]
 | 
	
		
			
				|  |  |         if (equipment!=null&&equipment.size()!=0){
 | 
	
		
			
				|  |  |             userEquipmentDao.deleteByUserId(userDO.getId());
 | 
	
		
			
				|  |  |             for (int i=0;i<equipment.size();i++){
 | 
	
		
			
				|  |  |                 JSONObject object = equipment.getJSONObject(i);
 | 
	
		
			
				|  |  |                 WlyyUserEquipmentDO userEquipmentDO = new WlyyUserEquipmentDO();
 | 
	
		
			
				|  |  |                 userEquipmentDO.setDel(1);
 | 
	
		
			
				|  |  |                 userEquipmentDO.setUserId(userDO.getId());
 | 
	
		
			
				|  |  |                 userEquipmentDO.setCity(object.getString("city"));
 | 
	
		
			
				|  |  |                 userEquipmentDO.setCityName(object.getString("cityName"));
 | 
	
		
			
				|  |  |                 userEquipmentDO.setTown(object.getString("town"));
 | 
	
		
			
				|  |  |                 userEquipmentDO.setTownName(object.getString("townName"));
 | 
	
		
			
				|  |  |                 if (!StringUtils.isEmpty(object.getString("hospital"))){
 | 
	
		
			
				|  |  |                     userEquipmentDO.setHospital(object.getString("hospital"));
 | 
	
		
			
				|  |  |                     userEquipmentDO.setHospitalName(object.getString("hospitalName"));
 | 
	
		
			
				|  |  |                 }
 | 
	
		
			
				|  |  |                 userEquipmentDO.setEquipmentId(object.getString("equipmentId"));
 | 
	
		
			
				|  |  |                 userEquipmentDO.setEquipmentName(object.getString("equipmentName"));
 | 
	
		
			
				|  |  |                 userEquipmentDO.setCreateTime(new Date());
 | 
	
		
			
				|  |  |                 userEquipmentDO.setUpdateTime(new Date());
 | 
	
		
			
				|  |  |                 userEquipmentDao.save(userEquipmentDO);
 | 
	
		
			
				|  |  |             }
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         result.put("response", ConstantUtils.SUCCESS);
 | 
	
		
			
				|  |  |         result.put("msg", userDO);
 | 
	
		
			
				|  |  |         return result;
 | 
	
	
		
			
				|  | @ -494,10 +551,22 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
 | 
	
		
			
				|  |  |             result.put("response",ConstantUtils.FAIL);
 | 
	
		
			
				|  |  |             return result;
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         //用户角色
 | 
	
		
			
				|  |  |         RoleDO roleDO = roleDao.findOne(user.getRoleId());
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         //用户所属区域
 | 
	
		
			
				|  |  |         List<WlyyUserAreaDO> userAreaDOList = userAreaDao.findAllByUserId(userId);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         //用户管理的设备
 | 
	
		
			
				|  |  |         List<WlyyUserEquipmentDO> userEquipmentDOList = userEquipmentDao.findAllByUserId(userId);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         //用户关联的机构
 | 
	
		
			
				|  |  |         List<BaseOrgUserDO>  orgList = baseOrgUserService.findAllByUserId(user.getId());
 | 
	
		
			
				|  |  |         JSONObject userInfo = new JSONObject();
 | 
	
		
			
				|  |  |         userInfo.put("user",user);
 | 
	
		
			
				|  |  |         userInfo.put("role",roleDO);
 | 
	
		
			
				|  |  |         userInfo.put("userArea",userAreaDOList);
 | 
	
		
			
				|  |  |         userInfo.put("userEquipment",userEquipmentDOList);
 | 
	
		
			
				|  |  |         userInfo.put("org",orgList);
 | 
	
		
			
				|  |  |         result.put("response",ConstantUtils.SUCCESS);
 | 
	
		
			
				|  |  |         result.put("msg",userInfo);
 |