Commit bce0537f authored by zengtianlai3's avatar zengtianlai3

Merge branch 'm33' into 'master'

修改设备数量显示出错问题

See merge request !38
parents f159dae6 9aaff620
...@@ -10,6 +10,6 @@ import lombok.Data; ...@@ -10,6 +10,6 @@ import lombok.Data;
@Data @Data
public class UserVo extends User { public class UserVo extends User {
@ApiModelProperty("应用数量") @ApiModelProperty("设备数量")
public int appCount; public int deviceCount;
} }
...@@ -15,7 +15,9 @@ ...@@ -15,7 +15,9 @@
</update> </update>
<select id="getUserList" resultType="iot.sixiang.license.model.vo.UserVo"> <select id="getUserList" resultType="iot.sixiang.license.model.vo.UserVo">
SELECT user.user_id, user_name, password, company, user.create_time, user.update_time,app_id, COUNT(app_name) AS appCount SELECT user.user_id, user_name, PASSWORD, company, user.create_time,
user.update_time,apply.app_id,
(SELECT COUNT(sn) FROM device WHERE apply.`app_id` = device.`app_id`) deviceCount
FROM USER LEFT JOIN apply ON user.user_id = apply.user_id FROM USER LEFT JOIN apply ON user.user_id = apply.user_id
where 1=1 where 1=1
<if test="null != userName and '' != userName"> <if test="null != userName and '' != userName">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment