工作流 修改一些todo

This commit is contained in:
bupengxiang
2023-04-20 18:02:56 +08:00
parent f70799511a
commit 22221173fe
13 changed files with 140 additions and 112 deletions
@@ -113,7 +113,6 @@ public class UserEO extends BaseEntity implements Serializable {
@TableField(exist = false)
private String roleId;
@TableField(exist = false)
private String orgName;
}
@@ -1,13 +1,12 @@
package com.adc.da.sys.vo;
import java.util.ArrayList;
import java.util.List;
import com.adc.da.sys.entity.OrgEO;
import com.adc.da.sys.entity.RoleEO;
import com.adc.da.sys.vo.iam.OrgsShortVoIAM;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class UserVO {
@@ -43,7 +42,7 @@ public class UserVO {
private String usname;
/**
* 角色ID列表
* 角色列表
*/
private List<RoleEO> roleEOList = new ArrayList<>();
@@ -163,11 +163,11 @@
#{id}
</foreach>
</select>
<select id="getUserEoById" resultMap="BaseResultMap">
select u.* , org.ORG_NAME as orgName from ts_user u
LEFT JOIN tr_user_org tuo on u.USID = tuo.ORG_ID
LEFT JOIN ts_org org on org.ID = tuo.ORG_ID
WHERE u.id = #{usid}
</select>
<!-- <select id="getUserEoById" resultMap="BaseResultMap">-->
<!-- select u.* , org.ORG_NAME as orgName from ts_user u-->
<!-- LEFT JOIN tr_user_org tuo on u.USID = tuo.ORG_ID-->
<!-- LEFT JOIN ts_org org on org.ID = tuo.ORG_ID-->
<!-- WHERE u.id = #{usid}-->
<!-- </select>-->
</mapper>