|
@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.validation.ConstraintViolationException;
|
|
import javax.validation.ConstraintViolationException;
|
|
|
|
|
|
|
|
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
|
|
import org.apache.shiro.authz.annotation.Logical;
|
|
import org.apache.shiro.authz.annotation.Logical;
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -75,7 +76,20 @@ public class TestPicController extends BaseController {
|
|
@RequiresPermissions("test:pic:testPic:list")
|
|
@RequiresPermissions("test:pic:testPic:list")
|
|
@RequestMapping(value = "data")
|
|
@RequestMapping(value = "data")
|
|
public Map<String, Object> data(TestPic testPic, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
public Map<String, Object> data(TestPic testPic, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
- Page<TestPic> page = testPicService.findPage(new Page<TestPic>(request, response), testPic);
|
|
|
|
|
|
+ Page<TestPic> page = testPicService.findPage(new Page<TestPic>(request, response), testPic);
|
|
|
|
+ if (Global.SYS_TYPE.equals("2")) {
|
|
|
|
+ List<TestPic> list = page.getList();
|
|
|
|
+ for (TestPic upload:
|
|
|
|
+ list) {
|
|
|
|
+ String a = "";
|
|
|
|
+ String path = upload.getPic();
|
|
|
|
+ String[] split = path.split("\\|");
|
|
|
|
+ for (int i = 0; i < split.length; i++) {
|
|
|
|
+ a += "http://" + request.getServerName() + split[i] + "|";
|
|
|
|
+ }
|
|
|
|
+ upload.setPic(a);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
return getBootstrapData(page);
|
|
return getBootstrapData(page);
|
|
}
|
|
}
|
|
|
|
|