试验管理

src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java

@@ -8,10 +8,13 @@ import com.bonus.aqgqj.basis.dao.ExperimentStandardMapper;
 import com.bonus.aqgqj.basis.entity.dto.ParamsDto;
 import com.bonus.aqgqj.basis.entity.vo.*;
 import com.bonus.aqgqj.basis.service.ExperimentStandardService;
+import com.bonus.aqgqj.system.vo.LoginUser;
 import com.bonus.aqgqj.utils.ServerResponse;
+import com.bonus.aqgqj.utils.UserUtil;
 import com.bonus.aqgqj.webResult.Constants;
 import com.bonus.aqgqj.webResult.HttpStatus;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.catalina.security.SecurityUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;

src/main/java/com/bonus/aqgqj/model/SysUser.java

@@ -111,6 +111,11 @@ public class SysUser extends PageEntity {
 	private String status;
 
 	private String newUser;
+	/**角色编码*/
+	private String roleCode;
+	/**班组ID*/
+	private String teamId;
+
 
 	public interface Status {
 		int DISABLED = 0;

src/main/resources/mappers/system/UserMapper.xml

@@ -48,9 +48,11 @@
 	</insert>
 	<!--登录查询用户-->
 	<select id="getUser" parameterType="String" resultType="com.bonus.aqgqj.model.SysUser">
-		select id,user_name as username,login_name as loginName,
+		select t.id,t.user_name as username,t.login_name as loginName,
-			   password,state,role_id as roleId,login_type loginType,new_user  newUser
+			   t.password,t.state,t.role_id as roleId,t.login_type loginType,t.new_user  newUser,
+				sr.role_code AS roleCode,sr.role_name AS roleName,t.team_id AS teamId
 		from sys_user t
+		LEFT JOIN sys_role sr ON t.role_id = sr.role_id AND sr.del_flag = 0
 		where t.login_name = #{username}
 	</select>