Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -1680,9 +1680,10 @@ public class ImService {
	 * @throws Exception
	 */
	public String pushHuiZhenMsg(com.alibaba.fastjson.JSONObject jsonObject,String doctor,String doctorName,String outpatientId,String patient,String outpatientType) throws Exception {
		if("1".equals(outpatientType)){
			return imUtil.sendImMsg(doctor, doctorName, patient+"_"+outpatientId+"_9", "31",jsonObject.toString(),"1");
		}else if("2".equals(outpatientType)){
//		if("1".equals(outpatientType)){
//			return imUtil.sendImMsg(doctor, doctorName, patient+"_"+outpatientId+"_9", "31",jsonObject.toString(),"1");
//		}else
		if("2".equals(outpatientType)){
			return imUtil.sendImMsg(doctor, doctorName, patient+"_"+outpatientId+"_12", "31",jsonObject.toString(),"1");
		}else{
			return null;

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -174,7 +174,10 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        UserDO user = userDao.findOne(id);
        RoleDO role = null;
        if (user != null) {
        if (user != null ) {
            if(!user.getEnabled()){
                throw new Exception("用户已失效！");
            }
            userinfo.put("id", user.getId());
            userinfo.put("name", user.getName());
            role = roleDao.findOne(user.getRoleId());