工单BUG

blade-service/blade-business/src/main/java/org/springblade/business/controller/UserOpinionController.java

@@ -298,7 +298,7 @@ public class UserOpinionController extends BladeController {
 		//获取当前登录人
 		BladeUser user = AuthUtil.getUser();
 		userOpinion.setCreateUser(user.getUserId());
-		userOpinion.setCreateUserName(user.getRoleName());
+		userOpinion.setCreateUserName(user.getUserName());
 		userOpinion.setCreateDept(user.getDeptId().contains(",") ? Long.parseLong(user.getDeptId().split(",")[0]) : Long.parseLong(user.getDeptId()));
 	}
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/SaveUserInfoByProjectMapper.xml

@@ -26,7 +26,15 @@
     </select>
 
     <select id="queryProjectBusinessUser" resultMap="contractInfoResultMap">
-        select * from m_project_assignment_user where is_deleted = 0 and project_id = #{projectId} and contract_id is NULL
+        select
+          pau.*
+        from m_project_assignment_user AS pau
+        LEFT JOIN blade_role AS br ON pau.role_id = br.id
+        where
+          pau.is_deleted = 0
+        and pau.project_id = #{projectId}
+        and pau.contract_id = #{contractId}
+        AND br.id is null
     </select>
 
 </mapper>