|
@@ -90,6 +90,7 @@ public class TaCompanySealController extends BaseController {
|
90
|
90
|
QueryWrapper<TaCompanySeal> queryWrapper = new QueryWrapper<>();
|
91
|
91
|
queryWrapper.eq("company_id", companyId);
|
92
|
92
|
queryWrapper.like(!StringUtils.isEmpty(sealName), "seal_name", sealName);
|
|
93
|
+ queryWrapper.ne("status", CommConstant.STATUS_DELETE);
|
93
|
94
|
queryWrapper.orderByDesc("create_date");
|
94
|
95
|
|
95
|
96
|
IPage<TaCompanySeal> result = iTaCompanySealService.page(pg, queryWrapper);
|
|
@@ -114,7 +115,7 @@ public class TaCompanySealController extends BaseController {
|
114
|
115
|
TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
|
115
|
116
|
String result = taCompanySealUtil.addSignaTure(taCompany.getFadadaCode(), taCompanySeal.getSealImg());
|
116
|
117
|
JSONObject params = JSONObject.parseObject(result);
|
117
|
|
- if (!String.valueOf(CommConstant.STATUS_NORMAL).equals(params.get("code"))){
|
|
118
|
+ if ((Integer) params.get("code") != 1){
|
118
|
119
|
responseBean.addError(params.get("msg").toString());
|
119
|
120
|
return responseBean;
|
120
|
121
|
}
|
|
@@ -150,14 +151,15 @@ public class TaCompanySealController extends BaseController {
|
150
|
151
|
iTaCompanyService.getById(taCompanySeal.getCompanyId());
|
151
|
152
|
String res = taCompanySealUtil.delSignature(taCompany.getFadadaCode(), taCompanySeal.getSignatureId());
|
152
|
153
|
JSONObject params = JSONObject.parseObject(res);
|
153
|
|
- if (!String.valueOf(params.get("code")).equals(CommConstant.STATUS_NORMAL)){
|
|
154
|
+ Integer code = (Integer) params.get("code");
|
|
155
|
+ if (code != 1){
|
154
|
156
|
responseBean.addError(params.getString("msg"));
|
155
|
157
|
return responseBean;
|
156
|
158
|
}
|
157
|
159
|
|
158
|
160
|
TaCompanySeal delInfo = new TaCompanySeal();
|
159
|
|
- taCompanySeal.setSealId(id);
|
160
|
|
- taCompanySeal.setStatus(CommConstant.STATUS_DELETE);
|
|
161
|
+ delInfo.setSealId(id);
|
|
162
|
+ delInfo.setStatus(CommConstant.STATUS_DELETE);
|
161
|
163
|
if(iTaCompanySealService.updateById(delInfo)){
|
162
|
164
|
responseBean.addSuccess("success");
|
163
|
165
|
}else {
|
|
@@ -183,7 +185,8 @@ public class TaCompanySealController extends BaseController {
|
183
|
185
|
ResponseBean responseBean = new ResponseBean();
|
184
|
186
|
try {
|
185
|
187
|
TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
|
186
|
|
- String res = taCompanySealUtil.replaceSignature(taCompany.getFadadaCode(), taCompanySeal.getSealImg());
|
|
188
|
+ TaCompanySeal sealInfo = iTaCompanySealService.getById(id);
|
|
189
|
+ String res = taCompanySealUtil.replaceSignature(taCompany.getFadadaCode(), sealInfo.getSignatureId(), taCompanySeal.getSealImg());
|
187
|
190
|
JSONObject params = JSONObject.parseObject(res);
|
188
|
191
|
Integer code = (Integer) params.get("code");
|
189
|
192
|
if (code != 1){
|