Compare commits
2 Commits
7638eb70df
...
69a7478b13
| Author | SHA1 | Date |
|---|---|---|
|
|
69a7478b13 | |
|
|
004e2ba23e |
|
|
@ -61,7 +61,7 @@ public class ImgFilesQueryExe {
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getImagePath() {
|
public String getImagePath() {
|
||||||
return imageConfig.getPath();
|
return imageConfig.getUrl();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 = "image")
|
@ConfigurationProperties(prefix = "file")
|
||||||
@Data
|
@Data
|
||||||
public class ImageConfig {
|
public class ImageConfig {
|
||||||
|
|
||||||
private String path;
|
private String url;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,10 @@
|
||||||
<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,
|
||||||
p.post_name,
|
CASE
|
||||||
|
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