Merge remote-tracking branch 'origin/develop_master' into develop_master

adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPosition.java

@@ -7,6 +7,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 import com.adc.da.slrs.sarRole.entity.TsRole;
+import com.adc.da.slrs.sarUser.entity.TsUser;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -22,7 +23,7 @@ import javax.validation.constraints.NotNull;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author zyl
@@ -71,6 +72,13 @@ public class TsPosition extends BaseEntity {
     @TableField(exist = false)
     private List<TsRole> roles;
 
+    @TableField(exist = false)
+    private List<TsUser> tsUser;
+
+    @ApiModelProperty(value = "操作人中文")
+    @TableField(exist = false)
+    private String uname;
+
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java

@@ -46,7 +46,13 @@ public class TsPositionServiceImpl extends ServiceImpl<TsPositionDao, TsPosition
         IPage page=new Page();
 //        page.setTotal(tsPositionDao.pageTotal());
         page.setTotal(tsPositionDao.countPositionAndRole(tsPosition));
-        page.setRecords(tsPositionDao.selectPositionAndRole(tsPosition));
+        List<TsPosition> list = tsPositionDao.selectPositionAndRole(tsPosition);
+        for (TsPosition tsPositions:list){
+            tsPositions.getTsUser().forEach(res->{
+                tsPositions.setOperator(res.getUname());
+            });
+        }
+        page.setRecords(list);
         page.setTotal(page.getTotal());
         page.setCurrent(tsPosition.getCurrent());
         page.setSize(tsPosition.getPageSize());

adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml

@@ -13,6 +13,9 @@
             <result property="id" column="rid"/>
             <result property="name" column="r_name"/>
         </collection>
+        <collection property="tsUser" ofType="com.adc.da.slrs.sarUser.entity.TsUser">
+            <result property="uname" column="UNAME"/>
+        </collection>
     </resultMap>
     <select id="getRole" resultType="com.adc.da.slrs.sarRole.entity.TsRole">
         select * from ts_role r
@@ -22,11 +25,12 @@
     </select>
 
     <select id="selectPositionAndRole" resultMap="PositionAndRole">
-        select p.*,r.id rid,r.name r_name from ts_position p
+        select p.*,r.id rid,r.name r_name ,tu.UNAME as UNAME from ts_position p
         left join ts_position_role pr
         on p.id=pr.position_id
         left join ts_role r
         on pr.role_id=r.id
+        left join ts_user tu on tu.account = p.operator
         <where>
             <if test="name!=null">
                 p.name like concat(concat('%',#{name}),'%')