java/zhihuishenqu.git

			@@ -60,7 +60,7 @@
			/**
			* 用户类型（1系统后台用户 2导办人员用户）
			*/
			@ApiModelProperty("用户类型（1系统后台用户 2导办人员用户 3.部门领导 4.普通用户（小程序用户））")
			@ApiModelProperty("用户类型（1系统后台用户 2导办人员用户 3.普通用户 4.小程序用户")
			private String userType;

			@@ -92,7 +92,7 @@
			newUser.setUserId(huaChengSysUser.getUserId()+"");
			newUser.setLoginName(huaChengSysUser.getPhone());
			newUser.setUserName(huaChengSysUser.getNickName());
			newUser.setUserType("4");
			newUser.setUserType("3");
			newUser.setPhonenumber(huaChengSysUser.getPhone());
			newUser.setSex(huaChengSysUser.getSex());
			newUser.setAvatar(huaChengSysUser.getImageUrl());

			@@ -65,10 +65,10 @@
			id,
			departmental_id,
			IFNULL(
			(select concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.to_user_id=user_id and user_type in (1,2,3)),
			(select concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.to_user_id=user_id and user_type in (1,2) or is_division_head=1),
			(select user_name from automessage_sys_user where a.to_user_id=user_id))toUserName,
			IFNULL(
			(select concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.from_user_id=user_id and user_type in (1,2,3)),
			(select concat(substring(user_name,1,1),'老师') from automessage_sys_user where a.from_user_id=user_id and user_type in (1,2) or is_division_head=1),
			(select user_name from automessage_sys_user where a.from_user_id=user_id))fromUserName,
			to_user_id,
			from_user_id,

	flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	flower_city/src/main/resources/mapper/GuideEvolveMapper.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史