Compare commits
No commits in common. "69a7478b13c3a294cc473897004f91e48fb1d3a1" and "7638eb70df2fe0990aab0d65ac9329cce9fe5988" have entirely different histories.
69a7478b13
...
7638eb70df
|
|
@ -61,7 +61,7 @@ public class ImgFilesQueryExe {
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getImagePath() {
|
public String getImagePath() {
|
||||||
return imageConfig.getUrl();
|
return imageConfig.getPath();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
@ConfigurationProperties(prefix = "file")
|
@ConfigurationProperties(prefix = "image")
|
||||||
@Data
|
@Data
|
||||||
public class ImageConfig {
|
public class ImageConfig {
|
||||||
|
|
||||||
private String url;
|
private String path;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -112,10 +112,7 @@
|
||||||
<select id="selectUserPage" resultType="com.zcloud.basic.info.persistence.dataobject.UserDO">
|
<select id="selectUserPage" resultType="com.zcloud.basic.info.persistence.dataobject.UserDO">
|
||||||
select
|
select
|
||||||
d.name as department_name,
|
d.name as department_name,
|
||||||
CASE
|
p.post_name,
|
||||||
WHEN c.type IN (3,4, 5) THEN u.post_name
|
|
||||||
ELSE p.post_name
|
|
||||||
END AS post_name,
|
|
||||||
u.id,
|
u.id,
|
||||||
u.user_id,
|
u.user_id,
|
||||||
u.username,
|
u.username,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue