rsf-admin/src/page/qlyInspect/AsnSelModal.jsx
@@ -38,7 +38,7 @@ }; const [formData, setFormData] = useState({ code: '' asnCode: '' }); const [tableData, setTableData] = useState([]); @@ -54,7 +54,7 @@ const reset = () => { setFormData({ code: '' asnCode: '' }) } @@ -72,9 +72,7 @@ }; const getData = async () => { const res = await request.post(`/qlyInspect/asn/list`, { ...formData, }); const res = await request.post(`/qlyInspect/asn/list`, { asnCode: formData.asnCode }); if (res?.data?.code === 200) { setTableData(res.data.data); } else { @@ -116,8 +114,8 @@ <Grid item md={4}> <TextField label={translate('table.field.asnOrder.code')} name="code" value={formData.code} name="asnCode" value={formData.asnCode} onChange={handleChange} size="small" /> rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -35,6 +35,7 @@ import com.vincent.rsf.server.system.mapper.UserMapper; import com.vincent.rsf.server.system.service.FieldsItemService; import com.vincent.rsf.server.system.service.UserLoginService; import com.vincent.rsf.server.system.service.UserService; import com.vincent.rsf.server.system.utils.ExtendFieldsUtils; import com.vincent.rsf.server.system.utils.SerialRuleUtils; import net.sf.jsqlparser.statement.select.Wait; @@ -68,7 +69,7 @@ @Autowired private TenantMapper tenantService; @Autowired private UserMapper userService; private UserService userService; @Autowired private UserLoginService userLoginService; @Autowired @@ -149,7 +150,7 @@ if (user.getStatus() != 1) { return R.parse(CodeRes.USER_10002); } if (!user.getPassword().equals(param.getPassword())) { if (!userService.comparePassword(user.getPassword(), param.getPassword())) { return R.parse(CodeRes.USER_10003); } rsf-server/src/main/java/com/vincent/rsf/server/system/service/UserService.java
@@ -21,4 +21,5 @@ String encodePassword(String password); User selectByUsernameWithoutTenant(String username, Long tenantId); } rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java
@@ -65,4 +65,9 @@ return password == null ? null : bCryptPasswordEncoder.encode(password); } @Override public User selectByUsernameWithoutTenant(String username, Long tenantId) { return baseMapper.selectByUsernameWithoutTenant(username,tenantId); } }